Attachment #371626 for bug #503290

Lines 54-60 Link Here

(-)samba-3.6.22/source3/libads/dns.c (+2 lines)
54	#endif	54	#endif
55	#endif	55	#endif
56		56
		57	#if !defined(T_SRV)
57	# define T_SRV ns_t_srv	58	# define T_SRV ns_t_srv
		59	#endif
58	#if !defined(T_NS) /* AIX 5.3 already defines T_NS */	60	#if !defined(T_NS) /* AIX 5.3 already defines T_NS */
59	# define T_NS ns_t_ns	61	# define T_NS ns_t_ns
60	#endif	62	#endif





static int smbd_shm_signing_destructor(struct smbd_shm_signing *s)
{
#if HAVE_MMAP
	anonymous_shared_free(s->shm_pointer);
#endif
	return 0;
}


			return false;
		}
		s->shm_size = 4096;
#if HAVE_MMAP
		s->shm_pointer =
			(uint8_t *)anonymous_shared_allocate(s->shm_size);
#endif
		if (s->shm_pointer == NULL) {
			talloc_free(s);
			return false;




	{
                SHA256_CTX tctx;

                pSHA256_Init(&tctx);
                pSHA256_Update(&tctx, key, key_len);
                pSHA256_Final(tk, &tctx);

                key = tk;
                key_len = SHA256_DIGEST_LENGTH;

                ctx->k_opad[i] ^= 0x5c;
        }

        pSHA256_Init(&ctx->ctx);
        pSHA256_Update(&ctx->ctx, ctx->k_ipad, 64);  
}

/***********************************************************************

***********************************************************************/
_PUBLIC_ void hmac_sha256_update(const uint8_t *data, size_t data_len, struct HMACSHA256Context *ctx)
{
        pSHA256_Update(&ctx->ctx, data, data_len); /* then text of datagram */
}

/***********************************************************************

{
        SHA256_CTX ctx_o;

        pSHA256_Final(digest, &ctx->ctx);

        pSHA256_Init(&ctx_o);
        pSHA256_Update(&ctx_o, ctx->k_opad, 64);
        pSHA256_Update(&ctx_o, digest, SHA256_DIGEST_LENGTH);
        pSHA256_Final(digest, &ctx_o);
}




};

void
pSHA256_Init (SHA256_CTX *m)
{
    m->sz[0] = 0;
    m->sz[1] = 0;

};

void
pSHA256_Update (SHA256_CTX *m, const void *v, size_t len)
{
    const unsigned char *p = (const unsigned char *)v;
    size_t old_sz = m->sz[0];

}

void
pSHA256_Final (void *res, SHA256_CTX *m)
{
    unsigned char zeros[72];
    unsigned offset = (m->sz[0] / 8) % 64;

    zeros[dstart+2] = (m->sz[1] >> 8) & 0xff;
    zeros[dstart+1] = (m->sz[1] >> 16) & 0xff;
    zeros[dstart+0] = (m->sz[1] >> 24) & 0xff;
    pSHA256_Update (m, zeros, dstart + 8);
    {
	int i;
	unsigned char *r = (unsigned char*)res;

Lines 61-69 Link Here

(-)samba-3.6.22/source3/modules/vfs_acl_common.c (-3 / +3 lines)
61	return status;	61	return status;
62	}	62	}
63		63
64	SHA256_Init(&tctx);	64	pSHA256_Init(&tctx);
65	SHA256_Update(&tctx, blob.data, blob.length);	65	pSHA256_Update(&tctx, blob.data, blob.length);
66	SHA256_Final(hash, &tctx);	66	pSHA256_Final(hash, &tctx);
67		67
68	return NT_STATUS_OK;	68	return NT_STATUS_OK;
69	}	69	}

Lines 982-987 Link Here

(-)samba-3.6.22/lib/util/util.c (+2 lines)
982	return true;	982	return true;
983	}	983	}
984		984
		985	#if HAVE_MMAP
985	struct anonymous_shared_header {	986	struct anonymous_shared_header {
986	union {	987	union {
987	size_t length;	988	size_t length;
Lines 1049-1054 Link Here
1049		1050
1050	munmap(hdr, hdr->u.length);	1051	munmap(hdr, hdr->u.length);
1051	}	1052	}
		1053	#endif
1052		1054
1053	#ifdef DEVELOPER	1055	#ifdef DEVELOPER
1054	/* used when you want a debugger started at a particular point in the	1056	/* used when you want a debugger started at a particular point in the

Lines 1838-1844 Link Here

(-)samba-3.6.22/source3/configure.in (-1 / +1 lines)
1838	DSO_EXPORTS=\$$DSO_EXPORTS_CMD$	1838	DSO_EXPORTS=\$$DSO_EXPORTS_CMD$
1839	fi	1839	fi
1840		1840
1841	if test x"$BLDSHARED" = x"true" ; then	1841	if test x"$BLDSHARED" = x"false" ; then
1842	LDFLAGS="$LDFLAGS -L./bin"	1842	LDFLAGS="$LDFLAGS -L./bin"
1843	fi	1843	fi
1844		1844

Lines 19541-19547 Link Here

(-)samba-3.6.5/source3/configure.old (-1 / +1 lines)
19541	DSO_EXPORTS=\$$DSO_EXPORTS_CMD$	19541	DSO_EXPORTS=\$$DSO_EXPORTS_CMD$
19542	fi	19542	fi
19543		19543
19544	if test x"$BLDSHARED" = x"true" ; then	19544	if test x"$BLDSHARED" = x"false" ; then
19545	LDFLAGS="$LDFLAGS -L./bin"	19545	LDFLAGS="$LDFLAGS -L./bin"
19546	fi	19546	fi
19547		19547

Return to bug 503290

Lines 80-86 Link Here

(-)samba-3.6.22/lib/crypto/sha256.c (-4 / +4 lines)
80	};	80	};
81		81
82	void	82	void
83	SHA256_Init (SHA256_CTX *m)	83	pSHA256_Init (SHA256_CTX *m)
84	{	84	{
85	m->sz[0] = 0;	85	m->sz[0] = 0;
86	m->sz[1] = 0;	86	m->sz[1] = 0;
Lines 187-193 Link Here
187	};	187	};
188		188
189	void	189	void
190	SHA256_Update (SHA256_CTX m, const void v, size_t len)	190	pSHA256_Update (SHA256_CTX m, const void v, size_t len)
191	{	191	{
192	const unsigned char p = (const unsigned char )v;	192	const unsigned char p = (const unsigned char )v;
193	size_t old_sz = m->sz[0];	193	size_t old_sz = m->sz[0];
Lines 222-228 Link Here
222	}	222	}
223		223
224	void	224	void
225	SHA256_Final (void res, SHA256_CTX m)	225	pSHA256_Final (void res, SHA256_CTX m)
226	{	226	{
227	unsigned char zeros[72];	227	unsigned char zeros[72];
228	unsigned offset = (m->sz[0] / 8) % 64;	228	unsigned offset = (m->sz[0] / 8) % 64;
Lines 238-244 Link Here
238	zeros[dstart+2] = (m->sz[1] >> 8) & 0xff;	238	zeros[dstart+2] = (m->sz[1] >> 8) & 0xff;
239	zeros[dstart+1] = (m->sz[1] >> 16) & 0xff;	239	zeros[dstart+1] = (m->sz[1] >> 16) & 0xff;
240	zeros[dstart+0] = (m->sz[1] >> 24) & 0xff;	240	zeros[dstart+0] = (m->sz[1] >> 24) & 0xff;
241	SHA256_Update (m, zeros, dstart + 8);	241	pSHA256_Update (m, zeros, dstart + 8);
242	{	242	{
243	int i;	243	int i;
244	unsigned char r = (unsigned char)res;	244	unsigned char r = (unsigned char)res;

Lines 101-107 Link Here

(-)samba-3.6.22/source3/smbd/signing.c (+4 lines)
101		101
102	static int smbd_shm_signing_destructor(struct smbd_shm_signing *s)	102	static int smbd_shm_signing_destructor(struct smbd_shm_signing *s)
103	{	103	{
		104	#if HAVE_MMAP
104	anonymous_shared_free(s->shm_pointer);	105	anonymous_shared_free(s->shm_pointer);
		106	#endif
105	return 0;	107	return 0;
106	}	108	}
107		109
Lines 181-188 Link Here
181	return false;	183	return false;
182	}	184	}
183	s->shm_size = 4096;	185	s->shm_size = 4096;
		186	#if HAVE_MMAP
184	s->shm_pointer =	187	s->shm_pointer =
185	(uint8_t *)anonymous_shared_allocate(s->shm_size);	188	(uint8_t *)anonymous_shared_allocate(s->shm_size);
		189	#endif
186	if (s->shm_pointer == NULL) {	190	if (s->shm_pointer == NULL) {
187	talloc_free(s);	191	talloc_free(s);
188	return false;	192	return false;

Lines 42-50 Link Here

(-)samba-3.6.22/lib/crypto/hmacsha256.c (-11 / +11 lines)
42	{	42	{
43	SHA256_CTX tctx;	43	SHA256_CTX tctx;
44		44
45	SHA256_Init(&tctx);	45	pSHA256_Init(&tctx);
46	SHA256_Update(&tctx, key, key_len);	46	pSHA256_Update(&tctx, key, key_len);
47	SHA256_Final(tk, &tctx);	47	pSHA256_Final(tk, &tctx);
48		48
49	key = tk;	49	key = tk;
50	key_len = SHA256_DIGEST_LENGTH;	50	key_len = SHA256_DIGEST_LENGTH;
Lines 63-70 Link Here
63	ctx->k_opad[i] ^= 0x5c;	63	ctx->k_opad[i] ^= 0x5c;
64	}	64	}
65		65
66	SHA256_Init(&ctx->ctx);	66	pSHA256_Init(&ctx->ctx);
67	SHA256_Update(&ctx->ctx, ctx->k_ipad, 64);	67	pSHA256_Update(&ctx->ctx, ctx->k_ipad, 64);
68	}	68	}
69		69
70	/***********************************************************************	70	/***********************************************************************
Lines 72-78 Link Here
72	***********************************************************************/	72	***********************************************************************/
73	_PUBLIC_ void hmac_sha256_update(const uint8_t data, size_t data_len, struct HMACSHA256Context ctx)	73	_PUBLIC_ void hmac_sha256_update(const uint8_t data, size_t data_len, struct HMACSHA256Context ctx)
74	{	74	{
75	SHA256_Update(&ctx->ctx, data, data_len); /* then text of datagram */	75	pSHA256_Update(&ctx->ctx, data, data_len); /* then text of datagram */
76	}	76	}
77		77
78	/***********************************************************************	78	/***********************************************************************
Lines 82-91 Link Here
82	{	82	{
83	SHA256_CTX ctx_o;	83	SHA256_CTX ctx_o;
84		84
85	SHA256_Final(digest, &ctx->ctx);	85	pSHA256_Final(digest, &ctx->ctx);
86		86
87	SHA256_Init(&ctx_o);	87	pSHA256_Init(&ctx_o);
88	SHA256_Update(&ctx_o, ctx->k_opad, 64);	88	pSHA256_Update(&ctx_o, ctx->k_opad, 64);
89	SHA256_Update(&ctx_o, digest, SHA256_DIGEST_LENGTH);	89	pSHA256_Update(&ctx_o, digest, SHA256_DIGEST_LENGTH);
90	SHA256_Final(digest, &ctx_o);	90	pSHA256_Final(digest, &ctx_o);
91	}	91	}

Lines 1838-1844 Link Here

(-)samba-3.6.22/source3/configure.in (-1 / +1 lines)
1838	DSO_EXPORTS=\$\(DSO_EXPORTS_CMD\)	1838	DSO_EXPORTS=\$\(DSO_EXPORTS_CMD\)
1839	fi	1839	fi
1840		1840
1841	if test x"$BLDSHARED" = x"true" ; then	1841	if test x"$BLDSHARED" = x"false" ; then
1842	LDFLAGS="$LDFLAGS -L./bin"	1842	LDFLAGS="$LDFLAGS -L./bin"
1843	fi	1843	fi
1844		1844