r2979 - in trunk/libmcrypto: . include/libmcrypto source

[Erik Eliasson]

Note that while it is being developed, this functionality is not
compiled unless you configure libmcrypto with "--enable-scsim".

--Erik

On Thu, 2006-11-30 at 11:12 +0100, erik at minisip.org wrote:
> Author: erik
> Date: 2006-11-30 11:12:12 +0100 (Thu, 30 Nov 2006)
> New Revision: 2979
> 
> Modified:
>    trunk/libmcrypto/configure.ac
>    trunk/libmcrypto/include/libmcrypto/Makefile.am
>    trunk/libmcrypto/source/Makefile.am
> Log:
> 
>  * Prepare libmcrypto for Xuan Pans HW support. 
> 
>    Where should the "voip-sim-card" classes be?
>    Libmikey uses them, so we don't want to put them in libmsip (there is no
>    dependency between them today). Probably we don't want to put it
>    in libmikey for the same reason. If we place it in libmcrypto, then
>    we can't have SIP/VoIP-specific methods (for example return a
>    SipUri object of the owner of the card), but I think that is no big
>    limitation since the methods should not be specific to any protocol
>    using it.
> 
>    -> "sim" support is now added to libmcrypto.
> 
>    With it comes SmartCard support. It'll go into libmcrypto now, but
>    is moved to libmutil easily if we think that is better once the code
>    is completed.
> 
> 
> 
> Modified: trunk/libmcrypto/configure.ac
> ===================================================================
> --- trunk/libmcrypto/configure.ac	2006-11-29 16:15:47 UTC (rev 2978)
> +++ trunk/libmcrypto/configure.ac	2006-11-30 10:12:12 UTC (rev 2979)
> @@ -28,6 +28,18 @@
>  AM_LIBMCRYPTO_CHECK_OPENSSL
>  AM_LIBMCRYPTO_CHECK_GNUTLS
>  
> +AC_ARG_ENABLE(scsim,
> +    AS_HELP_STRING([--enable-scsim],
> +        [enables hardware authentication token support]),
> +    [ if test "${enable_scsim}" = "yes"
> +      then
> +        AC_DEFINE(ENABLE_SCSIM, [], [hardware SIM support is enabled])
> +        ENABLE_SCSIM="yes"
> +      fi
> +      ])
> +AM_CONDITIONAL(ENABLE_SCSIM, test "${ENABLE_SCSIM}" = "yes" )
> +
> +
>  dnl Checks for header files.
>  AC_HEADER_STDC
>  AC_CHECK_HEADERS([malloc.h stdlib.h string.h unistd.h])
> 
> Modified: trunk/libmcrypto/include/libmcrypto/Makefile.am
> ===================================================================
> --- trunk/libmcrypto/include/libmcrypto/Makefile.am	2006-11-29 16:15:47 UTC (rev 2978)
> +++ trunk/libmcrypto/include/libmcrypto/Makefile.am	2006-11-30 10:12:12 UTC (rev 2979)
> @@ -21,8 +21,15 @@
>  OTHER_FILES += hmac256.h sha256.h
>  endif
>  
> +scsim_src =
> +if ENABLE_SCSIM
> +scsim_src += YOURHEADER.h
> +endif
> +
> +
>  noinst_HEADERS = \
>  		aes.h \
> +		$(scsim_src) \
>  		cert.h \
>  		ZrtpDH.h \
>  		hmac.h \
> 
> Modified: trunk/libmcrypto/source/Makefile.am
> ===================================================================
> --- trunk/libmcrypto/source/Makefile.am	2006-11-29 16:15:47 UTC (rev 2978)
> +++ trunk/libmcrypto/source/Makefile.am	2006-11-30 10:12:12 UTC (rev 2979)
> @@ -17,8 +17,16 @@
>  		libmcrypto_core.la \
>  		libmcrypto_imp.la
>  
> +scsim_src =
> +if ENABLE_SCSIM
> +scsim_src += YOURSOURCEHERE.cxx \
> +	     YOURSECONDSOURCEHERE.cxx
> +endif
> +
> +
>  libmcrypto_core_la_SOURCES = \
>  		init.cxx \
> +		$(scsim_src) \
>  		base64.cxx \
>  		uuid.cxx \
>  		rijndael-alg-fst.cxx
> 
> _______________________________________________
> Minisip-devel mailing list
> Minisip-devel at minisip.org
> http://lists.minisip.org/mailman/listinfo/minisip-devel
-- 
Erik Eliasson <eliasson at it.kth.se>