diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-04-13 19:04:45 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-04-13 19:04:45 +0400 |
| commit | 53fecff1ef023e5020d17dbe38ec8ee4fa499d12 (patch) | |
| tree | 30820e84d6b99238e1ecd963c1995382a93a7cf6 /include/violite.h | |
| parent | 04b601a7fe4c87d0b72f8b14c306a14c005846d7 (diff) | |
| download | mariadb-git-53fecff1ef023e5020d17dbe38ec8ee4fa499d12.tar.gz | |
Backport of:
ChangeSet@1.2703, 2007-12-07 09:35:28-05:00, cmiller@zippy.cornsilk.net +40 -0
Bug#13174: SHA2 function
Patch contributed from Bill Karwin, paper unnumbered CLA in Seattle
Implement SHA2 functions.
Chad added code to make it work with YaSSL. Also, he removed the
(probable) bug of embedded server never using SSL-dependent
functions. (libmysqld/Makefile.am didn't read ANY autoconf defs.)
Function specification:
SHA2( string cleartext, integer hash_length )
-> string hash, or NULL
where hash_length is one of 224, 256, 384, or 512. If either is
NULL or a length is unsupported, then the result is NULL. The
resulting string is always the length of the hash_length parameter
or is NULL.
Include the canonical hash examples from the NIST in the test
results.
---
Polish and address concerns of reviewers.
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h index 904c383d64a..05ceaa272c1 100644 --- a/include/violite.h +++ b/include/violite.h @@ -118,6 +118,7 @@ typedef my_socket YASSL_SOCKET_T; #include <openssl/ssl.h> #include <openssl/err.h> +#ifndef EMBEDDED_LIBRARY enum enum_ssl_init_error { SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, @@ -143,6 +144,7 @@ struct st_VioSSLFd const char *ca_file,const char *ca_path, const char *cipher, enum enum_ssl_init_error* error); void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd); +#endif /* ! EMBEDDED_LIBRARY */ #endif /* HAVE_OPENSSL */ void vio_end(void); |