Attachment #462810 for bug #607884




#if (defined HAVE_LIBCURL && defined LIBCURL_USE_OPENSSL) || defined SSL_SECURITY
#include <openssl/crypto.h>
#include <openssl/ssl.h>
#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
    || defined LIBRESSL_VERSION_NUMBER
static GMutex **openssl_mutex_array;
static void openssl_lock_callback(int mode, int type, const char *file, int line)
{

static void
init_openssl(void)
{
#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
    || defined LIBRESSL_VERSION_NUMBER
    int i;
    openssl_mutex_array = g_new0(GMutex *, CRYPTO_num_locks());


Lines 94-102 AMANDA_BSD_SECURITY Link Here

(-)a/config/amanda/amanda_configure.m4 (-1 / +1 lines)
94	AMANDA_BSDTCP_SECURITY	94	AMANDA_BSDTCP_SECURITY
95	AMANDA_BSDUDP_SECURITY	95	AMANDA_BSDUDP_SECURITY
96	AMANDA_RSH_SECURITY	96	AMANDA_RSH_SECURITY
		97	AMANDA_SSL_SECURITY
97	AMANDA_SSH_SECURITY	98	AMANDA_SSH_SECURITY
98	AMANDA_KRB5_SECURITY	99	AMANDA_KRB5_SECURITY
99	AMANDA_SSL_SECURITY
100		100
101	#	101	#
102	# Dumpers	102	# Dumpers

Lines 29-35 CLEANFILES += $(SCRIPTS_PERL) config.log Link Here

(-)a/device-src/Makefile.am (-1 / +1 lines)
29	## libamdevice.la	29	## libamdevice.la
30		30
31	amlib_LTLIBRARIES = libamdevice.la	31	amlib_LTLIBRARIES = libamdevice.la
32	libamdevice_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS)	32	libamdevice_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS) -ldl
33	libamdevice_la_SOURCES = \	33	libamdevice_la_SOURCES = \
34	property.c \	34	property.c \
35	device.c \	35	device.c \

Lines 239-245 EncodeHMACSHA256( Link Here

(-)a/device-src/s3-util.c (-2 / +5 lines)
239	unsigned char tk[SHA256_DIGEST_LENGTH];	239	unsigned char tk[SHA256_DIGEST_LENGTH];
240		240
241	// Initialise HMACh	241	// Initialise HMACh
242	#if OPENSSL_VERSION_NUMBER < 0x10100000L	242	#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
		243	\|\| defined LIBRESSL_VERSION_NUMBER
		244
243	HMAC_CTX HMAC;	245	HMAC_CTX HMAC;
244	#else	246	#else
245	HMAC_CTX *HMAC;	247	HMAC_CTX *HMAC;
Lines 254-260 EncodeHMACSHA256( Link Here
254	}	256	}
255		257
256	// Digest the key and message using SHA256	258	// Digest the key and message using SHA256
257	#if OPENSSL_VERSION_NUMBER < 0x10100000L	259	#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
		260	\|\| defined LIBRESSL_VERSION_NUMBER
258	HMAC_CTX_init(&HMAC);	261	HMAC_CTX_init(&HMAC);
259	HMAC_Init_ex(&HMAC, key, keylen, EVP_sha256(),NULL);	262	HMAC_Init_ex(&HMAC, key, keylen, EVP_sha256(),NULL);
260	HMAC_Update(&HMAC, datatohash, datalen);	263	HMAC_Update(&HMAC, datatohash, datalen);




    char *szS3Date = NULL;
    char *zulu_date = NULL;
    char *buf = NULL;
#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
    || defined LIBRESSL_VERSION_NUMBER
    HMAC_CTX ctx;
#else
    HMAC_CTX *ctx;


	/* run HMAC-SHA1 on the canonicalized string */
	md = g_byte_array_sized_new(EVP_MAX_MD_SIZE+1);
#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
    || defined LIBRESSL_VERSION_NUMBER
	HMAC_CTX_init(&ctx);
	HMAC_Init_ex(&ctx, hdl->secret_key, (int) strlen(hdl->secret_key),
		     EVP_sha1(), NULL);

Return to bug 607884

Lines 846-852 authenticate_request(S3Handle *hdl, Link Here

(-)a/device-src/s3.c (-2 / +4 lines)
846	char *szS3Date = NULL;	846	char *szS3Date = NULL;
847	char *zulu_date = NULL;	847	char *zulu_date = NULL;
848	char *buf = NULL;	848	char *buf = NULL;
849	#if OPENSSL_VERSION_NUMBER < 0x10100000L	849	#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
		850	\|\| defined LIBRESSL_VERSION_NUMBER
850	HMAC_CTX ctx;	851	HMAC_CTX ctx;
851	#else	852	#else
852	HMAC_CTX *ctx;	853	HMAC_CTX *ctx;
Lines 1209-1215 authenticate_request(S3Handle *hdl, Link Here
1209		1210
1210	/* run HMAC-SHA1 on the canonicalized string */	1211	/* run HMAC-SHA1 on the canonicalized string */
1211	md = g_byte_array_sized_new(EVP_MAX_MD_SIZE+1);	1212	md = g_byte_array_sized_new(EVP_MAX_MD_SIZE+1);
1212	#if OPENSSL_VERSION_NUMBER < 0x10100000L	1213	#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
		1214	\|\| defined LIBRESSL_VERSION_NUMBER
1213	HMAC_CTX_init(&ctx);	1215	HMAC_CTX_init(&ctx);
1214	HMAC_Init_ex(&ctx, hdl->secret_key, (int) strlen(hdl->secret_key),	1216	HMAC_Init_ex(&ctx, hdl->secret_key, (int) strlen(hdl->secret_key),
1215	EVP_sha1(), NULL);	1217	EVP_sha1(), NULL);

Lines 40-46 Link Here

(-)a/common-src/glib-util.c (-2 / +4 lines)
40	#if (defined HAVE_LIBCURL && defined LIBCURL_USE_OPENSSL) \|\| defined SSL_SECURITY	40	#if (defined HAVE_LIBCURL && defined LIBCURL_USE_OPENSSL) \|\| defined SSL_SECURITY
41	#include <openssl/crypto.h>	41	#include <openssl/crypto.h>
42	#include <openssl/ssl.h>	42	#include <openssl/ssl.h>
43	#if OPENSSL_VERSION_NUMBER < 0x10100000L	43	#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
		44	\|\| defined LIBRESSL_VERSION_NUMBER
44	static GMutex **openssl_mutex_array;	45	static GMutex **openssl_mutex_array;
45	static void openssl_lock_callback(int mode, int type, const char *file, int line)	46	static void openssl_lock_callback(int mode, int type, const char *file, int line)
46	{	47	{
Lines 58-64 static void openssl_lock_callback(int mode, int type, const char *file, int line Link Here
58	static void	59	static void
59	init_openssl(void)	60	init_openssl(void)
60	{	61	{
61	#if OPENSSL_VERSION_NUMBER < 0x10100000L	62	#if (defined OPENSSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER < 0x10100000L) \
		63	\|\| defined LIBRESSL_VERSION_NUMBER
62	int i;	64	int i;
63	openssl_mutex_array = g_new0(GMutex *, CRYPTO_num_locks());	65	openssl_mutex_array = g_new0(GMutex *, CRYPTO_num_locks());
64		66