diff --git a/headers/build/private/libroot/SHA256.h b/headers/build/private/libroot/SHA256.h new file mode 100644 index 0000000000..eed75ba1c2 --- /dev/null +++ b/headers/build/private/libroot/SHA256.h @@ -0,0 +1 @@ +#include "../../../private/libroot/SHA256.h" diff --git a/headers/build/private/shared/SHA256.h b/headers/build/private/shared/SHA256.h deleted file mode 100644 index 7108b49269..0000000000 --- a/headers/build/private/shared/SHA256.h +++ /dev/null @@ -1 +0,0 @@ -#include <../private/shared/SHA256.h> diff --git a/headers/private/shared/SHA256.h b/headers/private/libroot/SHA256.h similarity index 82% rename from headers/private/shared/SHA256.h rename to headers/private/libroot/SHA256.h index cb1d916398..b9c7307c32 100644 --- a/headers/private/shared/SHA256.h +++ b/headers/private/libroot/SHA256.h @@ -2,8 +2,8 @@ * Copyright 2008, Ingo Weinhold, ingo_weinhold@gmx.de. * Distributed under the terms of the MIT License. */ -#ifndef SHA_256_H -#define SHA_256_H +#ifndef _SHA_256_H +#define _SHA_256_H #include @@ -11,6 +11,8 @@ #define SHA_DIGEST_LENGTH 32 +namespace BPrivate { + class SHA256 { public: @@ -36,4 +38,9 @@ private: }; -#endif // SHA_256_H +} // namespace BPrivate + +using BPrivate::SHA256; + + +#endif // _SHA_256_H diff --git a/src/bin/package/Jamfile b/src/bin/package/Jamfile index b42984a827..5164fde2d0 100644 --- a/src/bin/package/Jamfile +++ b/src/bin/package/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src bin package ; -UsePrivateHeaders kernel shared storage support ; +UsePrivateHeaders kernel libroot shared storage support ; BinCommand package : command_add.cpp diff --git a/src/build/libpackage/Jamfile b/src/build/libpackage/Jamfile index 83cfa8b5db..c15d1c385f 100644 --- a/src/build/libpackage/Jamfile +++ b/src/build/libpackage/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src build libpackage ; -UsePrivateBuildHeaders kernel package shared storage support ; +UsePrivateBuildHeaders kernel package shared libroot storage support ; UseHeaders [ FDirName $(HAIKU_TOP) headers os net ] : true ; diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile index d117c06377..f146d85b87 100644 --- a/src/build/libroot/Jamfile +++ b/src/build/libroot/Jamfile @@ -9,7 +9,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers build os interface ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers build os storage ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ; -UsePrivateBuildHeaders kernel system ; +UsePrivateBuildHeaders kernel libroot system ; { local defines = [ FDefines @@ -29,7 +29,6 @@ UsePrivateBuildHeaders kernel system ; defines = [ FDefines KMESSAGE_CONTAINER_ONLY=1 ] ; ObjectC++Flags KMessage.cpp : $(defines) ; - } # locate the library @@ -65,6 +64,7 @@ local librootSources = misc.cpp sem.cpp thread.cpp + SHA256.cpp $(hostPlatformSources) @@ -100,5 +100,7 @@ SEARCH on [ FGristFiles driver_settings.cpp ] = [ FDirName $(HAIKU_TOP) src system libroot os ] ; SEARCH on [ FGristFiles $(strlSources) strnlen.cpp ] = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ; +SEARCH on [ FGristFiles SHA256.cpp ] + = [ FDirName $(HAIKU_TOP) src system libroot posix crypt ] ; SEARCH on [ FGristFiles KMessage.cpp ] = [ FDirName $(HAIKU_TOP) src system kernel messaging ] ; diff --git a/src/build/libshared/Jamfile b/src/build/libshared/Jamfile index 3999b00456..b7f504f989 100644 --- a/src/build/libshared/Jamfile +++ b/src/build/libshared/Jamfile @@ -11,10 +11,9 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits shared ] ; BuildPlatformStaticLibraryPIC libshared_build.a : Keymap.cpp NaturalCompare.cpp - SHA256.cpp RegExp.cpp - + : - + # no shared libs, but will require 'libgnuregex' dynamic library on Darwin ; diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile index bd3305cc1d..b849ecf189 100644 --- a/src/kits/package/Jamfile +++ b/src/kits/package/Jamfile @@ -4,6 +4,7 @@ UsePrivateHeaders app kernel shared + libroot storage support ; diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile index 3266d4ce34..d76805b77d 100644 --- a/src/kits/shared/Jamfile +++ b/src/kits/shared/Jamfile @@ -54,7 +54,6 @@ for architectureObject in [ MultiArchSubDirSetup ] { RegExp.cpp RWLocker.cpp RWLockManager.cpp - SHA256.cpp ShakeTrackingFilter.cpp StringForRate.cpp StringForSize.cpp diff --git a/src/system/libroot/Jamfile b/src/system/libroot/Jamfile index 210b92b42d..fcb06a9279 100644 --- a/src/system/libroot/Jamfile +++ b/src/system/libroot/Jamfile @@ -85,7 +85,6 @@ for architectureObject in [ MultiArchSubDirSetup ] { $(librootNoDebugObjects) [ TargetStaticLibsupc++ ] [ TargetLibgcc ] - shared ; # Use the standard libroot.so soname, so when the debug version is @@ -100,9 +99,8 @@ for architectureObject in [ MultiArchSubDirSetup ] { $(librootDebugObjects) [ TargetStaticLibsupc++ ] [ TargetLibgcc ] - shared ; - + StaticLibrary [ MultiArchDefaultGristFiles libm.a ] : empty.c ; StaticLibrary [ MultiArchDefaultGristFiles libpthread.a ] : empty.c ; diff --git a/src/system/libroot/posix/crypt/Jamfile b/src/system/libroot/posix/crypt/Jamfile index d0e6670287..8331fb7320 100644 --- a/src/system/libroot/posix/crypt/Jamfile +++ b/src/system/libroot/posix/crypt/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src system libroot posix crypt ; -UsePrivateHeaders shared ; +UsePrivateHeaders libroot ; UsePrivateSystemHeaders ; local architectureObject ; @@ -20,6 +20,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { crypto_scrypt.cpp crypt.cpp pbkdf2.cpp + SHA256.cpp ; } } diff --git a/src/kits/shared/SHA256.cpp b/src/system/libroot/posix/crypt/SHA256.cpp similarity index 98% rename from src/kits/shared/SHA256.cpp rename to src/system/libroot/posix/crypt/SHA256.cpp index c3fe936013..b15c454752 100644 --- a/src/kits/shared/SHA256.cpp +++ b/src/system/libroot/posix/crypt/SHA256.cpp @@ -12,6 +12,9 @@ #include +namespace BPrivate { + + static const uint32 kChunkSize = 64; // 64 bytes == 512 bits static const uint32 kRounds[64] = { @@ -188,3 +191,6 @@ SHA256::_ProcessChunk() fHash[6] += g; fHash[7] += h; } + + +} // namespace BPrivate diff --git a/src/system/libroot/posix/crypt/pbkdf2.cpp b/src/system/libroot/posix/crypt/pbkdf2.cpp index 792b783c20..a37f369b13 100644 --- a/src/system/libroot/posix/crypt/pbkdf2.cpp +++ b/src/system/libroot/posix/crypt/pbkdf2.cpp @@ -29,6 +29,7 @@ #include #include #include + #include "pbkdf2.h" /* Function which does the zeroing. */ diff --git a/src/tests/system/kernel/file_corruption/driver/Jamfile b/src/tests/system/kernel/file_corruption/driver/Jamfile index 047fd0a8fc..45d99b998c 100644 --- a/src/tests/system/kernel/file_corruption/driver/Jamfile +++ b/src/tests/system/kernel/file_corruption/driver/Jamfile @@ -3,6 +3,7 @@ SubDir HAIKU_TOP src tests system kernel file_corruption driver ; SubDirHdrs $(HAIKU_TOP) src system kernel device_manager ; UsePrivateKernelHeaders ; +UsePrivateHeaders libroot ; UseHeaders [ FDirName $(SUBDIR) $(DOTDOT) ] ; @@ -19,4 +20,4 @@ KernelAddon checksum_device : SEARCH on [ FGristFiles SHA256.cpp ] - = [ FDirName $(HAIKU_TOP) src kits shared ] ; + = [ FDirName $(HAIKU_TOP) src system libroot posix crypt ] ; diff --git a/src/tests/system/kernel/file_corruption/fs/Jamfile b/src/tests/system/kernel/file_corruption/fs/Jamfile index 159b5b4279..e46c9f89f4 100644 --- a/src/tests/system/kernel/file_corruption/fs/Jamfile +++ b/src/tests/system/kernel/file_corruption/fs/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tests system kernel file_corruption fs ; UsePrivateKernelHeaders ; -UsePrivateHeaders shared ; +UsePrivateHeaders libroot ; UseHeaders [ FDirName $(SUBDIR) $(DOTDOT) ] ; @@ -36,7 +36,7 @@ KernelAddon checksumfs : # from packagefs DebugSupport.cpp - # from src/kits/shared + # from src/system/libroot/posix/crypt SHA256.cpp ; @@ -44,6 +44,6 @@ KernelAddon checksumfs : SEARCH on [ FGristFiles DebugSupport.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems packagefs ] ; SEARCH on [ FGristFiles SHA256.cpp ] - = [ FDirName $(HAIKU_TOP) src kits shared ] ; + = [ FDirName $(HAIKU_TOP) src system libroot posix crypt ] ; HaikuSubInclude userland ; diff --git a/src/tests/system/kernel/file_corruption/fs/userland/Jamfile b/src/tests/system/kernel/file_corruption/fs/userland/Jamfile index 98ef5ae89f..f409d76637 100644 --- a/src/tests/system/kernel/file_corruption/fs/userland/Jamfile +++ b/src/tests/system/kernel/file_corruption/fs/userland/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tests system kernel file_corruption fs userland ; UsePrivateKernelHeaders ; -UsePrivateHeaders shared ; +UsePrivateHeaders libroot ; UseHeaders [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; @@ -36,4 +36,4 @@ Addon checksumfs : SEARCH on [ FGristFiles DebugSupport.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems packagefs ] ; SEARCH on [ FGristFiles SHA256.cpp ] - = [ FDirName $(HAIKU_TOP) src kits shared ] ; + = [ FDirName $(HAIKU_TOP) src system libroot posix crypt ] ; diff --git a/src/tools/package/Jamfile b/src/tools/package/Jamfile index 23d4d0940d..32a4b1bf19 100644 --- a/src/tools/package/Jamfile +++ b/src/tools/package/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src tools package ; -UsePrivateBuildHeaders shared kernel storage support ; +UsePrivateBuildHeaders libroot shared kernel storage support ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin package ] ;