Skip to content

Commit

Permalink
Merge branch 'master' into fix-dep-in-gcc133
Browse files Browse the repository at this point in the history
  • Loading branch information
romainthomas committed Apr 8, 2023
2 parents a32f9a0 + 4e318da commit 961cc44
Show file tree
Hide file tree
Showing 276 changed files with 559 additions and 1,129 deletions.
21 changes: 0 additions & 21 deletions Dockerfile

This file was deleted.

8 changes: 4 additions & 4 deletions cmake/LIEFDependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ if (LIEF_SUPPORT_CXX14 AND NOT LIEF_DISABLE_FROZEN)
set(LIEF_FROZEN_ENABLED 1)

if (NOT LIEF_OPT_FROZEN_EXTERNAL)
set(FROZEN_VERSION e6ddc43)
set(FROZEN_SHA256 SHA256=7aa0ab44eb91fc2c2431bd2e78bd3545aae750793a880064f6df0ef84c819065)
set(FROZEN_VERSION f6dbec6)
set(FROZEN_SHA256 SHA256=f961ec0f403d7720da12ec25a39790211d0bcecc342177838f3dd1fa6adb8ac3)
set(FROZEN_URL "${THIRD_PARTY_DIRECTORY}/frozen-${FROZEN_VERSION}.zip" CACHE STRING "URL to Frozen")
ExternalProject_Add(lief_frozen
URL ${FROZEN_URL}
Expand All @@ -212,8 +212,8 @@ endif()
# Boost leaf
# ----------
if(NOT LIEF_EXTERNAL_LEAF)
set(LEAF_VERSION 1.81.0-prerelease)
set(LEAF_SHA256 SHA256=746903d23f8c6145db5b5ec51e4071740843868fd368cad54de06c7e835a6ebd)
set(LEAF_VERSION 1.81.0)
set(LEAF_SHA256 SHA256=7974ad4d440114e1affd40067166a319cb5ea7309e03bf6622f20bc012ec46fc)
set(LEAF_URL "${THIRD_PARTY_DIRECTORY}/leaf-${LEAF_VERSION}.zip" CACHE STRING "URL to Leaf")
ExternalProject_Add(lief_leaf # :)
URL ${LEAF_URL}
Expand Down
1 change: 0 additions & 1 deletion doc/sphinx/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ Changelog

:PE:

* The *hooking* feature
* The Python API now returns `bytes` objects instead of `List[int]`
* Remove :meth:`lief.PE.ResourceNode.sort_by_id`
* Fix the ordering of childs of :class:`~lief.PE.ResourceNode`
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_H_
#define LIEF_ART_H_
#ifndef LIEF_ART_H
#define LIEF_ART_H

#include "LIEF/config.h"

Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/EnumToString.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_ENUM_TO_STRING_H_
#define LIEF_ART_ENUM_TO_STRING_H_
#ifndef LIEF_ART_ENUM_TO_STRING_H
#define LIEF_ART_ENUM_TO_STRING_H
#include "LIEF/visibility.h"
#include "LIEF/ART/enums.hpp"

Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/File.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_FILE_H_
#define LIEF_ART_FILE_H_
#ifndef LIEF_ART_FILE_H
#define LIEF_ART_FILE_H
#include <ostream>

#include "LIEF/ART/Header.hpp"
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/Header.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_HEADER_H_
#define LIEF_ART_HEADER_H_
#ifndef LIEF_ART_HEADER_H
#define LIEF_ART_HEADER_H

#include <array>
#include <cstdint>
Expand Down
7 changes: 2 additions & 5 deletions include/LIEF/ART/Parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_PARSER_H_
#define LIEF_ART_PARSER_H_
#ifndef LIEF_ART_PARSER_H
#define LIEF_ART_PARSER_H
#include <memory>
#include <vector>

#include "LIEF/ART/types.hpp"
#include "LIEF/visibility.h"

struct Profiler;

namespace LIEF {
class BinaryStream;
namespace ART {
Expand All @@ -32,7 +30,6 @@ class File;
//! @brief Class which parses an ART file and transform into a ART::File object
class LIEF_API Parser {
public:
friend struct ::Profiler;
static std::unique_ptr<File> parse(const std::string& file);
static std::unique_ptr<File> parse(std::vector<uint8_t> data, const std::string& name = "");

Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/enums.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_ENUMS_H_
#define LIEF_ART_ENUMS_H_
#ifndef LIEF_ART_ENUMS_H
#define LIEF_ART_ENUMS_H

namespace LIEF {
namespace ART {
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/hash.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_HASH_H_
#define LIEF_ART_HASH_H_
#ifndef LIEF_ART_HASH_H
#define LIEF_ART_HASH_H

#include "LIEF/visibility.h"
#include "LIEF/hash.hpp"
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/java_structures.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_JAVA_STRUCTURES_H_
#define LIEF_ART_JAVA_STRUCTURES_H_
#ifndef LIEF_ART_JAVA_STRUCTURES_H
#define LIEF_ART_JAVA_STRUCTURES_H

#include <cstring>
#include <tuple>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_PUBLIC_JSON_H_
#define LIEF_ART_PUBLIC_JSON_H_
#ifndef LIEF_ART_PUBLIC_JSON_H
#define LIEF_ART_PUBLIC_JSON_H

#include "LIEF/visibility.h"
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_TYPE_TRAITS_H_
#define LIEF_ART_TYPE_TRAITS_H_
#ifndef LIEF_ART_TYPE_TRAITS_H
#define LIEF_ART_TYPE_TRAITS_H

#include <vector>
#include "LIEF/iterators.hpp"
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/ART/utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ART_UTILS_H_
#define LIEF_ART_UTILS_H_
#ifndef LIEF_ART_UTILS_H
#define LIEF_ART_UTILS_H

#include <string>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_H_
#define LIEF_ABSTRACT_H_
#ifndef LIEF_ABSTRACT_H
#define LIEF_ABSTRACT_H

#include <LIEF/Abstract/Binary.hpp>
#include <LIEF/Abstract/enums.hpp>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/Binary.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_BINARY_H_
#define LIEF_ABSTRACT_BINARY_H_
#ifndef LIEF_ABSTRACT_BINARY_H
#define LIEF_ABSTRACT_BINARY_H

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/Function.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_FUNCTION_H_
#define LIEF_ABSTRACT_FUNCTION_H_
#ifndef LIEF_ABSTRACT_FUNCTION_H
#define LIEF_ABSTRACT_FUNCTION_H

#include <vector>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/Header.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_HEADER_H_
#define LIEF_ABSTRACT_HEADER_H_
#ifndef LIEF_ABSTRACT_HEADER_H
#define LIEF_ABSTRACT_HEADER_H

#include <ostream>
#include <set>
Expand Down
8 changes: 2 additions & 6 deletions include/LIEF/Abstract/Parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_BUILDER_H_
#define LIEF_ABSTRACT_BUILDER_H_
#ifndef LIEF_ABSTRACT_BUILDER_H
#define LIEF_ABSTRACT_BUILDER_H

#include <string>
#include <memory>
#include <vector>

#include "LIEF/visibility.h"

struct Profiler;

namespace LIEF {
class BinaryStream;
class Binary;

//! Main interface to parse an executable regardless of its format
class LIEF_API Parser {
public:
friend struct ::Profiler;

//! Construct an LIEF::Binary from the given filename
//!
//! @warning If the target file is a FAT Mach-O, it will return the **last** one
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/Relocation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_RELOCATION_H_
#define LIEF_ABSTRACT_RELOCATION_H_
#ifndef LIEF_ABSTRACT_RELOCATION_H
#define LIEF_ABSTRACT_RELOCATION_H

#include "LIEF/types.hpp"
#include "LIEF/Object.hpp"
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/Section.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_SECTION_H_
#define LIEF_ABSTRACT_SECTION_H_
#ifndef LIEF_ABSTRACT_SECTION_H
#define LIEF_ABSTRACT_SECTION_H

#include <string>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/Symbol.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_SYMBOLS_H_
#define LIEF_ABSTRACT_SYMBOLS_H_
#ifndef LIEF_ABSTRACT_SYMBOLS_H
#define LIEF_ABSTRACT_SYMBOLS_H

#include <cstdint>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/enums.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_ENUMS_H_
#define LIEF_ABSTRACT_ENUMS_H_
#ifndef LIEF_ABSTRACT_ENUMS_H
#define LIEF_ABSTRACT_ENUMS_H

#include "LIEF/types.hpp"

Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/hash.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_HASH_H_
#define LIEF_ABSTRACT_HASH_H_
#ifndef LIEF_ABSTRACT_HASH_H
#define LIEF_ABSTRACT_HASH_H

#include "LIEF/visibility.h"
#include "LIEF/hash.hpp"
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/Abstract/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_ABSTRACT_JSON_H_
#define LIEF_ABSTRACT_JSON_H_
#ifndef LIEF_ABSTRACT_JSON_H
#define LIEF_ABSTRACT_JSON_H

#include "LIEF/visibility.h"
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/BinaryStream/BinaryStream.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_BINARY_STREAM_H_
#define LIEF_BINARY_STREAM_H_
#ifndef LIEF_BINARY_STREAM_H
#define LIEF_BINARY_STREAM_H

#include <cstdint>
#include <vector>
Expand Down
6 changes: 3 additions & 3 deletions include/LIEF/BinaryStream/Convert.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_CONVERT_H_
#define LIEF_CONVERT_H_
#ifndef LIEF_CONVERT_H
#define LIEF_CONVERT_H
namespace LIEF {
namespace Convert {

Expand All @@ -24,4 +24,4 @@ void swap_endian(T*);
}
}

#endif // LIEF_CONVERT_H_
#endif // LIEF_CONVERT_H
4 changes: 2 additions & 2 deletions include/LIEF/DEX.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_DEX_H_
#define LIEF_DEX_H_
#ifndef LIEF_DEX_H
#define LIEF_DEX_H
#include "LIEF/config.h"

#if defined(LIEF_DEX_SUPPORT)
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/DEX/Class.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_DEX_CLASS_H_
#define LIEF_DEX_CLASS_H_
#ifndef LIEF_DEX_CLASS_H
#define LIEF_DEX_CLASS_H

#include <climits>

Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/DEX/CodeInfo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_DEX_CODE_INFO_H_
#define LIEF_DEX_CODE_INFO_H_
#ifndef LIEF_DEX_CODE_INFO_H
#define LIEF_DEX_CODE_INFO_H

#include <cstdint>
#include <ostream>
Expand Down
4 changes: 2 additions & 2 deletions include/LIEF/DEX/EnumToString.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LIEF_DEX_ENUM_TO_STRING_H_
#define LIEF_DEX_ENUM_TO_STRING_H_
#ifndef LIEF_DEX_ENUM_TO_STRING_H
#define LIEF_DEX_ENUM_TO_STRING_H
#include "LIEF/visibility.h"
#include "LIEF/DEX/enums.hpp"
#include "LIEF/DEX/MapItem.hpp"
Expand Down

0 comments on commit 961cc44

Please sign in to comment.