Attachment #843279 for bug #787314

View | Details | Raw Unified | Return to bug 787314
Collapse All | Expand All




#include <strings.h>
#endif /* HAVE_STRINGS_H */

#include <openssl/ossl_typ.h>
#include <openssl/evp.h>
#include <openssl/md5.h>

#define ISC_MD5_DIGESTLENGTH 16U



void
isc_md5_final(isc_md5_t *ctx, unsigned char *digest);

//  typedef isc_md5_t             MD5_CTX;
# define MD5Init(c)             isc_md5_init(c)
# define MD5Update(c, p, s)     isc_md5_update(c, p, s)
# define MD5Final(d, c)         isc_md5_final((c), (d)) /* swapped */
//  typedef MD5_CTX                       EVP_MD_CTX;
# define EVP_DigestInit(c)              MD5Init(c)
# define EVP_DigestUpdate(c, p, s)      MD5Update(c, p, s)
# define EVP_DigestFinal(c, d, pdl)     \




{
	u_char	digest[64];
	u_int	len;
	EVP_MD_CTX *ctx = EVP_MD_CTX_new();
        pkt[length / 4] = htonl(keyid); 
	EVP_DigestInit(ctx);
	EVP_DigestUpdate(ctx, (u_char *)key, (u_int)strlen(key));
	EVP_DigestUpdate(ctx, (u_char *)pkt, (u_int)length);
	EVP_DigestFinal(ctx, digest, &len);
	EVP_MD_CTX_free(ctx);
	memmove((u_char *)pkt + length + 4, digest, len);
	return (len + 4);
}

Return to bug 787314

Lines 262-273 MD5authencrypt( Link Here

(-)ptpd-ptpd-2.3.1/src/dep/ntpengine/ntp_isc_md5.c (-5 / +6 lines)
262	{	262	{
263	u_char digest[64];	263	u_char digest[64];
264	u_int len;	264	u_int len;
265	EVP_MD_CTX ctx;	265	EVP_MD_CTX *ctx = EVP_MD_CTX_new();
266	pkt[length / 4] = htonl(keyid);	266	pkt[length / 4] = htonl(keyid);
267	EVP_DigestInit(&ctx);	267	EVP_DigestInit(ctx);
268	EVP_DigestUpdate(&ctx, (u_char *)key, (u_int)strlen(key));	268	EVP_DigestUpdate(ctx, (u_char *)key, (u_int)strlen(key));
269	EVP_DigestUpdate(&ctx, (u_char *)pkt, (u_int)length);	269	EVP_DigestUpdate(ctx, (u_char *)pkt, (u_int)length);
270	EVP_DigestFinal(&ctx, digest, &len);	270	EVP_DigestFinal(ctx, digest, &len);
		271	EVP_MD_CTX_free(ctx);
271	memmove((u_char *)pkt + length + 4, digest, len);	272	memmove((u_char *)pkt + length + 4, digest, len);
272	return (len + 4);	273	return (len + 4);
273	}	274	}

Lines 55-60 Link Here

(-)ptpd-ptpd-2.3.1/src/dep/ntpengine/ntp_isc_md5.h (-2 / +6 lines)
55	#include <strings.h>	55	#include <strings.h>
56	#endif /* HAVE_STRINGS_H */	56	#endif /* HAVE_STRINGS_H */
57		57
		58	#include <openssl/ossl_typ.h>
		59	#include <openssl/evp.h>
		60	#include <openssl/md5.h>
		61
58	#define ISC_MD5_DIGESTLENGTH 16U	62	#define ISC_MD5_DIGESTLENGTH 16U
59		63
60		64
Lines 78-88 isc_md5_update(isc_md5_t *ctx, const uns Link Here
78	void	78	void
79	isc_md5_final(isc_md5_t ctx, unsigned char digest);	79	isc_md5_final(isc_md5_t ctx, unsigned char digest);
80		80
81	typedef isc_md5_t MD5_CTX;	81	// typedef isc_md5_t MD5_CTX;
82	# define MD5Init(c) isc_md5_init(c)	82	# define MD5Init(c) isc_md5_init(c)
83	# define MD5Update(c, p, s) isc_md5_update(c, p, s)	83	# define MD5Update(c, p, s) isc_md5_update(c, p, s)
84	# define MD5Final(d, c) isc_md5_final((c), (d)) /* swapped */	84	# define MD5Final(d, c) isc_md5_final((c), (d)) /* swapped */
85	typedef MD5_CTX EVP_MD_CTX;	85	// typedef MD5_CTX EVP_MD_CTX;
86	# define EVP_DigestInit(c) MD5Init(c)	86	# define EVP_DigestInit(c) MD5Init(c)
87	# define EVP_DigestUpdate(c, p, s) MD5Update(c, p, s)	87	# define EVP_DigestUpdate(c, p, s) MD5Update(c, p, s)
88	# define EVP_DigestFinal(c, d, pdl) \	88	# define EVP_DigestFinal(c, d, pdl) \