Bug 178268 - [patch] net/openldap24-server: Add SHA2 password module
Summary: [patch] net/openldap24-server: Add SHA2 password module
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Xin LI
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-30 21:50 UTC by mike
Modified: 2013-05-30 02:13 UTC (History)
0 users

See Also:


Attachments
file.diff (1.91 KB, patch)
2013-04-30 21:50 UTC, mike
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description mike 2013-04-30 21:50:00 UTC
There is a SHA2 password backend module in contrib/slapd-modules/passwd/sha2 that allows for SHA256 and SHA384 as well as SHA512 hash algorithms.

It would be really cool if this was a option, otherwise, I have to compile and install by hand.

There is a usability issue though, and that is slappasswd does not understand the new hash providers.

Example:
    # slappasswd -h "{SSHA}" -s test
    {SSHA}el+EK4rV5AnEodolaO2qXKyxLHsbSmnR
    
    # slappasswd -h "{SHA512}" -s test
    Password generation failed for scheme {SHA512}: scheme not recognized

With that, I still feel it is useful, so attached is a svn diff for ports/net/openldap24-server

Fix: Patch attached with submission follows:
How-To-Repeat: n/a
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-04-30 21:50:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->delphij

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-05-30 00:42:53 UTC
Author: delphij
Date: Wed May 29 23:42:40 2013
New Revision: 319397
URL: http://svnweb.freebsd.org/changeset/ports/319397

Log:
  Add an option to build SHA2 modules.
  
  PR:		ports/178268
  Submitted by:	Mike Carlson <mike bayphoto com>

Modified:
  head/net/openldap24-server/Makefile
  head/net/openldap24-server/pkg-plist

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Wed May 29 23:36:16 2013	(r319396)
+++ head/net/openldap24-server/Makefile	Wed May 29 23:42:40 2013	(r319397)
@@ -69,7 +69,7 @@ OPTIONS_DEFINE+=	SOCK ODBC RLOOKUPS SLP 
 OPTIONS_DEFINE+=	ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS
 OPTIONS_DEFINE+=	DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PROXYCACHE
 OPTIONS_DEFINE+=	REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
-OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD DYNAMIC_BACKENDS SASL
+OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL
 
 OPTIONS_DEFAULT=	BDB TCP_WRAPPERS SEQMOD SYNCPROV DYNAMIC_BACKENDS
 
@@ -110,6 +110,7 @@ TRANSLUCENT_DESC=	With Translucent Proxy
 UNIQUE_DESC=		With attribute Uniqueness overlay
 VALSORT_DESC=		With Value Sorting overlay
 SMBPWD_DESC=		With Samba Password hashes overlay
+SHA2_DESC=		With SHA2 Password hashes overlay
 DYNAMIC_BACKENDS_DESC=	Build dynamic backends
 .endif
 
@@ -440,6 +441,12 @@ PLIST_SUB+=		SMBPWD=""
 PLIST_SUB+=		SMBPWD="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MSHA2}
+PLIST_SUB+=		SHA2=""
+.else
+PLIST_SUB+=		SHA2="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MRLOOKUPS}
 CONFIGURE_ARGS+=	--enable-rlookups
 PLIST_SUB+=		RLOOKUPS=""
@@ -510,11 +517,16 @@ test: build
 	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
 
-.if ${PORT_OPTIONS:MSMBPWD}
 post-build:
+	@${DO_NADA}
+.if ${PORT_OPTIONS:MSMBPWD}
 	@cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd; ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} DEFS="-DDO_SAMBA" all
 .endif
+.if ${PORT_OPTIONS:MSHA2}
+	@cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all
+.endif
 .endif
 
 pre-su-install:
@@ -553,6 +565,13 @@ post-install:
 		${PREFIX}/libexec/openldap/
 	@${LN} -s smbk5pwd.so.0 ${PREFIX}/libexec/openldap/smbk5pwd.so
 .endif
+.if ${PORT_OPTIONS:MSHA2}
+	@${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/passwd/sha2/pw-sha2.la \
+		${PREFIX}/libexec/openldap/
+	@${INSTALL_PROGRAM} ${WRKSRC}/contrib/slapd-modules/passwd/sha2/.libs/pw-sha2.so.0 \
+		${PREFIX}/libexec/openldap/
+	@${LN} -s pw-sha2.so.0 ${PREFIX}/libexec/openldap/pw-sha2.so
+.endif
 .endif
 	@${CAT} ${PKGMESSAGE}
 

Modified: head/net/openldap24-server/pkg-plist
==============================================================================
--- head/net/openldap24-server/pkg-plist	Wed May 29 23:36:16 2013	(r319396)
+++ head/net/openldap24-server/pkg-plist	Wed May 29 23:42:40 2013	(r319397)
@@ -82,6 +82,9 @@ etc/openldap/DB_CONFIG.example
 %%BACK_SQL%%libexec/openldap/back_sql-2.4.so.%%SHLIB_MAJOR%%
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
+%%SHA2%%libexec/openldap/pw-sha2.la
+%%SHA2%%libexec/openldap/pw-sha2.so
+%%SHA2%%libexec/openldap/pw-sha2.so.0
 %%SMBPWD%%libexec/openldap/smbk5pwd.la
 %%SMBPWD%%libexec/openldap/smbk5pwd.so
 %%SMBPWD%%libexec/openldap/smbk5pwd.so.0
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Xin LI freebsd_committer freebsd_triage 2013-05-30 02:13:31 UTC
State Changed
From-To: open->closed

Committed, thanks!