diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
| commit | 3fce787ffe938bb3e959ff0b3ec231e54d086c76 (patch) | |
| tree | 198f537b43a34301bf781c67193c572f6743f925 /xorg-server/include | |
| parent | 236c69d6034b152598ce35abaf3559b0eaa89c12 (diff) | |
| parent | 578938f1cdd5a06dd6fa28167d575ec980322a5d (diff) | |
| download | vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.gz vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.bz2 vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/include/dix-config.h.in | 14 | ||||
| -rw-r--r-- | xorg-server/include/xsha1.h | 19 |
3 files changed, 34 insertions, 2 deletions
diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am index aa5db7d5f..d684f9c2b 100644 --- a/xorg-server/include/Makefile.am +++ b/xorg-server/include/Makefile.am @@ -66,4 +66,5 @@ AM_CFLAGS = $(DIX_CFLAGS) EXTRA_DIST = \ dix-config-apple-verbatim.h \ eventconvert.h eventstr.h \ - protocol-versions.h + protocol-versions.h \ + xsha1.h diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in index 798d9e73c..109637115 100644 --- a/xorg-server/include/dix-config.h.in +++ b/xorg-server/include/dix-config.h.in @@ -160,9 +160,21 @@ /* Define to 1 if you have the <rpcsvc/dbm.h> header file. */ #undef HAVE_RPCSVC_DBM_H -/* Define to use libmd SHA1 functions instead of OpenSSL libcrypto */ +/* Define to use libc SHA1 functions */ +#undef HAVE_SHA1_IN_LIBC + +/* Define to use CommonCrypto SHA1 functions */ +#undef HAVE_SHA1_IN_COMMONCRYPTO + +/* Define to use libmd SHA1 functions */ #undef HAVE_SHA1_IN_LIBMD +/* Define to use libgcrypt SHA1 functions */ +#undef HAVE_SHA1_IN_LIBGCRYPT + +/* Define to use libsha1 for SHA1 */ +#undef HAVE_SHA1_IN_LIBSHA1 + /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 diff --git a/xorg-server/include/xsha1.h b/xorg-server/include/xsha1.h new file mode 100644 index 000000000..aab71067a --- /dev/null +++ b/xorg-server/include/xsha1.h @@ -0,0 +1,19 @@ +#ifndef XSHA1_H +#define XSHA1_H + +/* Initialize SHA1 computation. Returns NULL on error. */ +void *x_sha1_init(void); + +/* + * Add some data to be hashed. ctx is the value returned by x_sha1_init() + * Returns 0 on error, 1 on success. + */ +int x_sha1_update(void *ctx, void *data, int size); + +/* + * Place the hash in result, and free ctx. + * Returns 0 on error, 1 on success. + */ +int x_sha1_final(void *ctx, unsigned char result[20]); + +#endif |