svn commit: r387683 - branches/2015Q2/net/openldap24-server/files

[Xin LI]

Author: delphij
Date: Wed May 27 22:09:15 2015
New Revision: 387683
URL: https://svnweb.freebsd.org/changeset/ports/387683

Log:
  MFH: r387682
  
  Add a patch to resolve symbol conflict between SHA2 module with OpenSSL's
  SHA2 implementation.
  
  Without this, e.g. SSHA512 scheme would result in a crash due to stack
  corruption, which is a result of different SHA512 context size in the
  contributed SHA2 implementation and the OpenSSL one, plus the allocation
  is on stack.
  
  PR:		197004
  Approved by:	ports-secteam

Added:
  branches/2015Q2/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
     - copied unchanged from r387682, head/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
Modified:
Directory Properties:
  branches/2015Q2/   (props changed)

Copied: branches/2015Q2/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h (from r387682, head/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q2/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h	Wed May 27 22:09:15 2015	(r387683, copy of r387682, head/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h)
@@ -0,0 +1,24 @@
+--- contrib/slapd-modules/passwd/sha2/sha2.h.orig	2014-09-19 01:48:49 UTC
++++ contrib/slapd-modules/passwd/sha2/sha2.h
+@@ -142,6 +142,21 @@ typedef struct _SHA512_CTX {
+ 
+ typedef SHA512_CTX SHA384_CTX;
+ 
++#define	SHA256_Init	_sha2_SHA256_Init
++#define	SHA256_Update	_sha2_SHA256_Update
++#define	SHA256_Final	_sha2_SHA256_Final
++#define	SHA256_End	_sha2_SHA256_End
++#define	SHA256_Data	_sha2_SHA256_Data
++#define	SHA384_Init	_sha2_SHA384_Init
++#define	SHA384_Update	_sha2_SHA384_Update
++#define	SHA384_Final	_sha2_SHA384_Final
++#define	SHA384_End	_sha2_SHA384_End
++#define	SHA384_Data	_sha2_SHA384_Data
++#define	SHA512_Init	_sha2_SHA512_Init
++#define	SHA512_Update	_sha2_SHA512_Update
++#define	SHA512_Final	_sha2_SHA512_Final
++#define	SHA512_End	_sha2_SHA512_End
++#define	SHA512_Data	_sha2_SHA512_Data
+ 
+ /*** SHA-256/384/512 Function Prototypes ******************************/
+ #ifndef NOPROTO