[haiku-commits] haiku: hrev51458 - src/system/libroot/posix/crypt src/kits/shared src headers/private/libroot headers/private/shared

  • From: waddlesplash@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 3 Oct 2017 20:27:52 +0200 (CEST)

hrev51458 adds 1 changeset to branch 'master'
old head: c1e80b79c12dc1c0e168e209de2999554f9b9de1
new head: 6aff37d1c79e20748c683ae224bd629f88a5b0be
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=6aff37d1c79e+%5Ec1e80b79c12d

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

6aff37d1c79e: Move SHA256 class to libroot instead of linking libshared into 
libroot.
  
  Discussed with PulkoMandy and on the haiku-commits mailing list.
  
  Thanks to @jessicah for compile-testing and fixing 2 small issues I missed.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

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

Revision:    hrev51458
Commit:      6aff37d1c79e20748c683ae224bd629f88a5b0be
URL:         http://cgit.haiku-os.org/haiku/commit/?id=6aff37d1c79e
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Mon Oct  2 16:35:57 2017 UTC

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

17 files changed, 38 insertions(+), 23 deletions(-)
headers/build/private/libroot/SHA256.h                  |  1 +
headers/build/private/shared/SHA256.h                   |  1 -
headers/private/{shared => libroot}/SHA256.h            | 13 ++++++++++---
src/bin/package/Jamfile                                 |  2 +-
src/build/libpackage/Jamfile                            |  2 +-
src/build/libroot/Jamfile                               |  6 ++++--
src/build/libshared/Jamfile                             |  5 ++---
src/kits/package/Jamfile                                |  1 +
src/kits/shared/Jamfile                                 |  1 -
src/system/libroot/Jamfile                              |  4 +---
src/system/libroot/posix/crypt/Jamfile                  |  3 ++-
.../shared => system/libroot/posix/crypt}/SHA256.cpp    |  6 ++++++
src/system/libroot/posix/crypt/pbkdf2.cpp               |  1 +
src/tests/system/kernel/file_corruption/driver/Jamfile  |  3 ++-
src/tests/system/kernel/file_corruption/fs/Jamfile      |  6 +++---
.../system/kernel/file_corruption/fs/userland/Jamfile   |  4 ++--
src/tools/package/Jamfile                               |  2 +-

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

diff --git a/headers/build/private/libroot/SHA256.h 
b/headers/build/private/libroot/SHA256.h
new file mode 100644
index 0000000..eed75ba
--- /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 7108b49..0000000
--- 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 cb1d916..b9c7307 100644
--- a/headers/private/shared/SHA256.h
+++ b/headers/private/libroot/SHA256.h
@@ -2,8 +2,8 @@
  * Copyright 2008, Ingo Weinhold, ingo_weinhold@xxxxxx.
  * 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 <SupportDefs.h>
@@ -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 b42984a..5164fde 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 83cfa8b..c15d1c3 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 d117c06..f146d85 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 3999b00..b7f504f 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 bd3305c..b849ecf 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 3266d4c..d76805b 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 210b92b..fcb06a9 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 d0e6670..8331fb7 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 c3fe936..b15c454 100644
--- a/src/kits/shared/SHA256.cpp
+++ b/src/system/libroot/posix/crypt/SHA256.cpp
@@ -12,6 +12,9 @@
 #include <ByteOrder.h>
 
 
+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 792b783..a37f369 100644
--- a/src/system/libroot/posix/crypt/pbkdf2.cpp
+++ b/src/system/libroot/posix/crypt/pbkdf2.cpp
@@ -29,6 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <ByteOrder.h>
+
 #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 047fd0a..45d99b9 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 159b5b4..e46c9f8 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 98ef5ae..f409d76 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 <userland>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 23d4d09..32a4b1b 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 ] ;
 


Other related posts:

  • » [haiku-commits] haiku: hrev51458 - src/system/libroot/posix/crypt src/kits/shared src headers/private/libroot headers/private/shared - waddlesplash