---
V2 change - Hide Sha1* symbols.
libselinux/src/Makefile | 2 +-
libselinux/src/label_internal.h | 4 +-
libselinux/src/label_support.c | 6 +-
libselinux/src/sha1.c | 215 ++++++++++++++++++++++++++++++++++++++++
libselinux/src/sha1.h | 86 ++++++++++++++++
libselinux/utils/Makefile | 2 +-
6 files changed, 310 insertions(+), 5 deletions(-)
create mode 100644 libselinux/src/sha1.c
create mode 100644 libselinux/src/sha1.h
diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
index 8e2223e..feab561 100644
--- a/libselinux/src/Makefile
+++ b/libselinux/src/Makefile
@@ -112,7 +112,7 @@ $(LIBA): $(OBJS)
$(RANLIB) $@
$(LIBSO): $(LOBJS)
- $(CC) $(CFLAGS) -shared -o $@ $^ -lpcre -ldl -lcrypto $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
+ $(CC) $(CFLAGS) -shared -o $@ $^ -lpcre -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
ln -sf $@ $(TARGET)
$(LIBPC): $(LIBPC).in ../VERSION
diff --git a/libselinux/src/label_internal.h b/libselinux/src/label_internal.h
index 2aa7a7b..cefa80b 100644
--- a/libselinux/src/label_internal.h
+++ b/libselinux/src/label_internal.h
@@ -11,10 +11,10 @@
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
-#include <openssl/sha.h>
#include <selinux/selinux.h>
#include <selinux/label.h>
#include "dso.h"
+#include "sha1.h"
/*
* Installed backends
@@ -51,7 +51,7 @@ struct selabel_sub {
* calculate the hash the hashbuf will hold a concatenation of all the files
* used. This is released once the value has been calculated.
*/
-#define DIGEST_SPECFILE_SIZE SHA_DIGEST_LENGTH
+#define DIGEST_SPECFILE_SIZE SHA1_HASH_SIZE
#define DIGEST_FILES_MAX 8
struct selabel_digest {
unsigned char *digest; /* SHA1 digest of specfiles */
diff --git a/libselinux/src/label_support.c b/libselinux/src/label_support.c
index ac52885..324dc51 100644
--- a/libselinux/src/label_support.c
+++ b/libselinux/src/label_support.c
@@ -100,11 +100,15 @@ int hidden read_spec_entries(char *line_buf, int num_args, ...)
/* Once all the specfiles are in the hash_buf, generate the hash. */
void hidden digest_gen_hash(struct selabel_digest *digest)
{
+ Sha1Context context;
+
/* If SELABEL_OPT_DIGEST not set then just return */
if (!digest)
return;
- SHA1(digest->hashbuf, digest->hashbuf_size, digest->digest);
+ Sha1Initialise(&context);
+ Sha1Update(&context, digest->hashbuf, digest->hashbuf_size);
+ Sha1Finalise(&context, (SHA1_HASH *)digest->digest);
free(digest->hashbuf);
digest->hashbuf = NULL;
return;
diff --git a/libselinux/src/sha1.c b/libselinux/src/sha1.c
new file mode 100644
index 0000000..db64404
--- /dev/null
+++ b/libselinux/src/sha1.c
@@ -0,0 +1,215 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// LibSha1
+//
+// Implementation of SHA1 hash function.
+// Original author: Steve Reid <sreid@xxxxxxxxxxxxxx>
+// Contributions by: James H. Brown <jbrown@xxxxxxxxxxxx>, Saul Kravitz <Saul.Kravitz@xxxxxxxxxx>,
+// and Ralph Giles <giles@xxxxxxxxxxxxxxx>
+// Modified by WaterJuice retaining Public Domain license.
+//
+// This is free and unencumbered software released into the public domain - June 2013 waterjuice.org
+// Modified to stop symbols being exported for libselinux shared library - October 2015
+// Richard Haines <richard_c_haines@xxxxxxxxxxxxxx>
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// IMPORTS
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "sha1.h"
+#include "dso.h"
+#include <memory.h>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// TYPES
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+typedef union
+{
+ uint8_t c [64];
+ uint32_t l [16];
+} CHAR64LONG16;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// INTERNAL FUNCTIONS
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+// blk0() and blk() perform the initial expand.
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+ |(rol(block->l[i],8)&0x00FF00FF))
+
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+ ^block->l[(i+2)&15]^block->l[i&15],1))
+
+// (R0+R1), R2, R3, R4 are the different operations used in SHA1
+#define R0(v,w,x,y,z,i) z += ((w&(x^y))^y) + blk0(i)+ 0x5A827999 + rol(v,5); w=rol(w,30);
+#define R1(v,w,x,y,z,i) z += ((w&(x^y))^y) + blk(i) + 0x5A827999 + rol(v,5); w=rol(w,30);
+#define R2(v,w,x,y,z,i) z += (w^x^y) + blk(i) + 0x6ED9EBA1 + rol(v,5); w=rol(w,30);
+#define R3(v,w,x,y,z,i) z += (((w|x)&y)|(w&x)) + blk(i) + 0x8F1BBCDC + rol(v,5); w=rol(w,30);
+#define R4(v,w,x,y,z,i) z += (w^x^y) + blk(i) + 0xCA62C1D6 + rol(v,5); w=rol(w,30);
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// TransformFunction
+//
+// Hash a single 512-bit block. This is the core of the algorithm
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+static
+void
+ TransformFunction
+ (
+ uint32_t state[5],
+ const uint8_t buffer[64]
+ )
+{
+ uint32_t a;
+ uint32_t b;
+ uint32_t c;
+ uint32_t d;
+ uint32_t e;
+ uint8_t workspace[64];
+ CHAR64LONG16* block = (CHAR64LONG16*) workspace;
+
+ memcpy( block, buffer, 64 );
+
+ // Copy context->state[] to working vars
+ a = state[0];
+ b = state[1];
+ c = state[2];
+ d = state[3];
+ 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;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// PUBLIC FUNCTIONS
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sha1Initialise
+//
+// Initialises an SHA1 Context. Use this to initialise/reset a context.
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void hidden
+ Sha1Initialise
+ (
+ Sha1Context* Context
+ )
+{
+ // SHA1 initialization constants
+ Context->State[0] = 0x67452301;
+ Context->State[1] = 0xEFCDAB89;
+ Context->State[2] = 0x98BADCFE;
+ Context->State[3] = 0x10325476;
+ Context->State[4] = 0xC3D2E1F0;
+ Context->Count[0] = 0;
+ Context->Count[1] = 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sha1Update
+//
+// Adds data to the SHA1 context. This will process the data and update the internal state of the context. Keep on
+// calling this function until all the data has been added. Then call Sha1Finalise to calculate the hash.
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void hidden
+ Sha1Update
+ (
+ Sha1Context* Context,
+ void* Buffer,
+ uint32_t BufferSize
+ )
+{
+ uint32_t i;
+ uint32_t j;
+
+ j = (Context->Count[0] >> 3) & 63;
+ if( (Context->Count[0] += BufferSize << 3) < (BufferSize << 3) )
+ {
+ Context->Count[1]++;
+ }
+
+ Context->Count[1] += (BufferSize >> 29);
+ if( (j + BufferSize) > 63 )
+ {
+ i = 64 - j;
+ memcpy( &Context->Buffer[j], Buffer, i );
+ TransformFunction(Context->State, Context->Buffer);
+ for( ; i + 63 < BufferSize; i += 64 )
+ {
+ TransformFunction(Context->State, (uint8_t*)Buffer + i);
+ }
+ j = 0;
+ }
+ else
+ {
+ i = 0;
+ }
+
+ memcpy( &Context->Buffer[j], &((uint8_t*)Buffer)[i], BufferSize - i );
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sha1Finalise
+//
+// Performs the final calculation of the hash and returns the digest (20 byte buffer containing 160bit hash). After
+// calling this, Sha1Initialised must be used to reuse the context.
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void hidden
+ Sha1Finalise
+ (
+ Sha1Context* Context,
+ SHA1_HASH* Digest
+ )
+{
+ uint32_t i;
+ uint8_t finalcount[8];
+
+ for( i=0; i<8; i++ )
+ {
+ finalcount[i] = (unsigned char)((Context->Count[(i >= 4 ? 0 : 1)]
+ >> ((3-(i & 3)) * 8) ) & 255); // Endian independent
+ }
+ Sha1Update( Context, (uint8_t*)"\x80", 1 );
+ while( (Context->Count[0] & 504) != 448 )
+ {
+ Sha1Update( Context, (uint8_t*)"\0", 1 );
+ }
+
+ Sha1Update( Context, finalcount, 8 ); // Should cause a Sha1TransformFunction()
+ for( i=0; i<SHA1_HASH_SIZE; i++ )
+ {
+ Digest->bytes[i] = (uint8_t)((Context->State[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+ }
+}
+
diff --git a/libselinux/src/sha1.h b/libselinux/src/sha1.h
new file mode 100644
index 0000000..dba5667
--- /dev/null
+++ b/libselinux/src/sha1.h
@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// LibSha1
+//
+// Implementation of SHA1 hash function.
+// Original author: Steve Reid <sreid@xxxxxxxxxxxxxx>
+// Contributions by: James H. Brown <jbrown@xxxxxxxxxxxx>, Saul Kravitz <Saul.Kravitz@xxxxxxxxxx>,
+// and Ralph Giles <giles@xxxxxxxxxxxxxxx>
+// Modified by WaterJuice retaining Public Domain license.
+//
+// This is free and unencumbered software released into the public domain - June 2013 waterjuice.org
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _sha1_h_
+#define _sha1_h_
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// IMPORTS
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include <stdint.h>
+#include <stdio.h>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// TYPES
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// Sha1Context - This must be initialised using Sha1Initialised. Do not modify the contents of this structure directly.
+typedef struct
+{
+ uint32_t State[5];
+ uint32_t Count[2];
+ uint8_t Buffer[64];
+} Sha1Context;
+
+#define SHA1_HASH_SIZE ( 160 / 8 )
+
+typedef struct
+{
+ uint8_t bytes [SHA1_HASH_SIZE];
+} SHA1_HASH;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// PUBLIC FUNCTIONS
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sha1Initialise
+//
+// Initialises an SHA1 Context. Use this to initialise/reset a context.
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void
+ Sha1Initialise
+ (
+ Sha1Context* Context
+ );
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sha1Update
+//
+// Adds data to the SHA1 context. This will process the data and update the internal state of the context. Keep on
+// calling this function until all the data has been added. Then call Sha1Finalise to calculate the hash.
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void
+ Sha1Update
+ (
+ Sha1Context* Context,
+ void* Buffer,
+ uint32_t BufferSize
+ );
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sha1Finalise
+//
+// Performs the final calculation of the hash and returns the digest (20 byte buffer containing 160bit hash). After
+// calling this, Sha1Initialised must be used to reuse the context.
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void
+ Sha1Finalise
+ (
+ Sha1Context* Context,
+ SHA1_HASH* Digest
+ );
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#endif //_sha1_h_
+
diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile
index 5dda66e..cac85c7 100644
--- a/libselinux/utils/Makefile
+++ b/libselinux/utils/Makefile
@@ -28,7 +28,7 @@ LDLIBS += -L../src -lselinux -L$(LIBDIR)
TARGETS=$(patsubst %.c,%,$(wildcard *.c))
-sefcontext_compile: LDLIBS += -lpcre -lcrypto ../src/libselinux.a -lsepol
+sefcontext_compile: LDLIBS += -lpcre ../src/libselinux.a -lsepol
ifeq ($(DISABLE_AVC),y)
UNUSED_TARGETS+=compute_av compute_create compute_member compute_relabel
