Merge branch 'master' into master

This commit is contained in:
lda 2024-08-27 12:25:28 -04:00
commit cc665ac7fc
7 changed files with 67 additions and 19 deletions

3
configure vendored
View file

@ -269,7 +269,8 @@ ${TAB}done
${LIB_NAME}: ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so
install: ${LIB_NAME}
${TAB}mkdir -p ${OUT}/lib
${TAB}mkdir -p \$(PREFIX)/${OUT}/lib
${TAB}mkdir -p \$(PREFIX)/lib
${TAB}cp ${OUT}/lib/lib${LIB_NAME}.a \$(PREFIX)/lib/lib${LIB_NAME}.a
${TAB}cp ${OUT}/lib/lib${LIB_NAME}.so \$(PREFIX)/lib/lib${LIB_NAME}.so
$(collect ${INCLUDE}/ '' '' \$\(PREFIX\)/include/${LIB_NAME}/ install_out)

View file

@ -41,6 +41,16 @@
* due to the lack of a 64-bit integer type, so that hash
* function has been omitted.
*/
#include <stddef.h>
/**
* This is an enum to be used to identify the type of SHA used.
*/
typedef enum HashType
{
HASH_SHA1,
HASH_SHA256
} HashType;
/**
* This function takes a pointer to a NULL-terminated C string, and
@ -64,6 +74,20 @@ extern unsigned char * Sha256(char *);
*/
extern unsigned char * Sha1(char *);
/**
* This function behaves just like
* .Fn Sha256 ,
* except that it allows for a generic byte array, instead of a string.
*/
extern unsigned char * Sha256Raw(unsigned char *, size_t);
/**
* This function behaves just like
* .Fn Sha1 ,
* except that it allows for a generic byte array, instead of a string.
*/
extern unsigned char * Sha1Raw(unsigned char *, size_t);
/**
* Convert a SHA byte buffer into a hex string. These hex strings
* are typically what is transmitted, stored, and compared, however
@ -71,6 +95,6 @@ extern unsigned char * Sha1(char *);
* bytes directly, which is why the conversion to a hex string is
* a separate step.
*/
extern char * ShaToHex(unsigned char *);
extern char * ShaToHex(unsigned char *, HashType);
#endif /* CYTOPLASM_SHA_H */

View file

@ -28,21 +28,44 @@
#include <string.h>
char *
ShaToHex(unsigned char *bytes)
ShaToHex(unsigned char *bytes, HashType type)
{
size_t i = 0;
char *str = Malloc(((strlen((char *) bytes) * 2) + 1) * sizeof(char));
size_t i = 0, size;
char *str;
switch (type)
{
case HASH_SHA1:
size = 20;
break;
case HASH_SHA256:
size = 32;
break;
default:
return NULL;
}
str = Malloc(((size * 2) + 1) * sizeof(char));
if (!str)
{
return NULL;
}
while (bytes[i] != '\0')
for (i = 0; i < size; i++)
{
snprintf(str + (2 * i), 3, "%02x", bytes[i]);
i++;
}
return str;
}
unsigned char *
Sha256(char *str)
{
return Sha256Raw((unsigned char *) str, str ? strlen(str) : 0);
}
unsigned char *
Sha1(char *str)
{
return Sha1Raw((unsigned char *) str, str ? strlen(str) : 0);
}

View file

@ -29,12 +29,12 @@
#include <limits.h>
/* TODO: Verify LibreSSL support later */
#if TLS_IMPL == TLS_OPENSSL
#if defined(TLS_IMPL) && (TLS_IMPL == TLS_OPENSSL)
#include <openssl/sha.h>
unsigned char *
Sha1(char *str)
Sha1Raw(unsigned char *str, size_t len)
{
unsigned char *digest;
if (!str)
@ -43,7 +43,7 @@ Sha1(char *str)
}
digest = Malloc(20 + 1);
SHA1((unsigned char *) str, strlen(str), digest);
SHA1(str, len, digest);
digest[20] = '\0';
return digest;
}
@ -261,7 +261,7 @@ Sha1Calculate(Sha1Context * ctx, unsigned char *out)
}
unsigned char *
Sha1(char *str)
Sha1Raw(unsigned char *str, size_t len)
{
Sha1Context ctx;
unsigned char *out;
@ -278,7 +278,7 @@ Sha1(char *str)
}
Sha1Init(&ctx);
Sha1Update(&ctx, str, strlen(str));
Sha1Update(&ctx, str, len);
Sha1Calculate(&ctx, out);
out[160 / 8] = '\0';

View file

@ -31,12 +31,12 @@
/* TODO: Verify LibreSSL support later */
#if TLS_IMPL == TLS_OPENSSL
#if defined(TLS_IMPL) && (TLS_IMPL == TLS_OPENSSL)
#include <openssl/sha.h>
unsigned char *
Sha256(char *str)
Sha256Raw(unsigned char *str, size_t len)
{
unsigned char *digest;
if (!str)
@ -45,7 +45,7 @@ Sha256(char *str)
}
digest = Malloc(32 + 1);
SHA256((unsigned char *) str, strlen(str), digest);
SHA256(str, len, digest);
digest[32] = '\0';
return digest;
}
@ -192,7 +192,7 @@ Sha256Process(Sha256Context * context, unsigned char *data, size_t length)
}
unsigned char *
Sha256(char *str)
Sha256Raw(unsigned char *str, size_t len)
{
Sha256Context context;
size_t i;
@ -228,7 +228,7 @@ Sha256(char *str)
context.length = 0;
memset(context.buffer, 0, 64);
Sha256Process(&context, (unsigned char *) str, strlen(str));
Sha256Process(&context, str, len);
memset(fill, 0, 64);
fill[0] = 0x80;

View file

@ -23,7 +23,7 @@
*/
#include <Tls.h>
#if TLS_IMPL == TLS_LIBRESSL
#if defined(TLS_IMPL) && (TLS_IMPL == TLS_LIBRESSL)
#include <Memory.h>
#include <Log.h>

View file

@ -23,7 +23,7 @@
*/
#include <Tls.h>
#if TLS_IMPL == TLS_OPENSSL
#if defined(TLS_IMPL) && (TLS_IMPL == TLS_OPENSSL)
#include <Memory.h>
#include <Log.h>