Author: bh
Date: 2007-07-17 21:00:10 +0200 (Tue, 17 Jul 2007)
New Revision: 270
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/include/libopenvas.h
trunk/openvas-libraries/libopenvas/network.c
Log:
* libopenvas/network.c (nessus_install_passwd_cb, sslerror)
(sslerror2): Removed. They are no longer used anywhere.
(stream_get_ssl): Change the return type to void* so that we no
longer need openssl.h
* include/libopenvas.h: Remove declaration of
nessus_install_passwd_cb and sslerror. Update declaration of
stream_get_ssl
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2007-07-17 18:22:01 UTC (rev 269)
+++ trunk/openvas-libraries/ChangeLog 2007-07-17 19:00:10 UTC (rev 270)
@@ -1,3 +1,14 @@
+2007-07-17 Bernhard Herzog <[EMAIL PROTECTED]>
+
+ * libopenvas/network.c (nessus_install_passwd_cb, sslerror)
+ (sslerror2): Removed. They are no longer used anywhere.
+ (stream_get_ssl): Change the return type to void* so that we no
+ longer need openssl.h
+
+ * include/libopenvas.h: Remove declaration of
+ nessus_install_passwd_cb and sslerror. Update declaration of
+ stream_get_ssl
+
2007-07-02 Bernhard Herzog <[EMAIL PROTECTED]>
* libopenvas/network.c (verify_peer_certificate): If the peer
Modified: trunk/openvas-libraries/include/libopenvas.h
===================================================================
--- trunk/openvas-libraries/include/libopenvas.h 2007-07-17 18:22:01 UTC
(rev 269)
+++ trunk/openvas-libraries/include/libopenvas.h 2007-07-17 19:00:10 UTC
(rev 270)
@@ -166,8 +166,6 @@
ExtFunc void plug_set_ssl_cert(struct arglist*, char*);
ExtFunc void plug_set_ssl_key(struct arglist*, char*);
ExtFunc void plug_set_ssl_pem_password(struct arglist*, char*);
-ExtFunc void sslerror(char*);
-ExtFunc void nessus_install_passwd_cb(SSL_CTX*, char*);
#endif
@@ -409,7 +407,7 @@
ExtFunc int stream_get_err(int);
#ifdef HAVE_SSL
-ExtFunc SSL* stream_get_ssl(int);
+ExtFunc void* stream_get_ssl(int);
ExtFunc X509* stream_get_server_certificate(int);
ExtFunc char* stream_get_ascii_server_certificate(int);
#endif
Modified: trunk/openvas-libraries/libopenvas/network.c
===================================================================
--- trunk/openvas-libraries/libopenvas/network.c 2007-07-17 18:22:01 UTC
(rev 269)
+++ trunk/openvas-libraries/libopenvas/network.c 2007-07-17 19:00:10 UTC
(rev 270)
@@ -36,8 +36,6 @@
#include <setjmp.h>
-#include <openssl/ssl.h>
-
#define TIMEOUT 20
#ifndef INADDR_NONE
@@ -326,23 +324,7 @@
* default value: 1 according to SVID 3, BSD 4.3, ISO 9899 :-(
*/
-/* FIXME: remove sslerror and sslerror2 once the TLS migration is complete */
-/* Adapted from stunnel source code */
-ExtFunc
-void sslerror2(txt, err)
- char *txt;
- int err;
-{
- fprintf(stderr, "[%d] obsolete function sslerror2 was called\n", getpid());
-}
-void
-sslerror(txt)
- char *txt;
-{
- fprintf(stderr, "[%d] obsolete function sslerror was called\n", getpid());
-}
-
ExtFunc
void tlserror(char *txt, int err)
{
@@ -428,15 +410,6 @@
}
-ExtFunc void
-nessus_install_passwd_cb(ssl_ctx, pass)
- SSL_CTX *ssl_ctx;
- char *pass;
-{
- fprintf(stderr, "[%d] obsolete function nessus_install_passwd_cb was
called\n",
- getpid());
-}
-
static int
set_gnutls_sslv23(gnutls_session_t session)
{
@@ -1282,7 +1255,7 @@
* certificates and the server's ciphers if sslv2 is used. Some of the
* functionality should perhaps be moved to openvas-libraries.
*/
-ExtFunc SSL*
+ExtFunc void*
stream_get_ssl(int fd)
{
return NULL;
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
