SF.net SVN: mahogany: [7140] trunk/M/src/util/ssl.cpp

Revision: 7140
          http://svn.sourceforge.net/mahogany/?rev=7140&view=rev
Author:   vadz
Date:     2006-10-19 17:22:49 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
wrap/forward more SSL functions used by the latest cclient

Modified Paths:
--------------
    trunk/M/src/util/ssl.cpp

Modified: trunk/M/src/util/ssl.cpp
===================================================================
--- trunk/M/src/util/ssl.cpp	2006-10-20 00:22:12 UTC (rev 7139)
+++ trunk/M/src/util/ssl.cpp	2006-10-20 00:22:49 UTC (rev 7140)
@@ -121,9 +121,13 @@
 SSL_DEF( int, SSL_set_fd, (SSL *s, int fd), (s, fd) );
 SSL_DEF( int, SSL_get_error, (ssl_const SSL *s, int ret_code), (s, ret_code) );
 SSL_DEF( X509 *, SSL_get_peer_certificate, (ssl_const SSL *s), (s) );
+SSL_DEF( int, sk_num, (const STACK *s), (s) );
+SSL_DEF( char *, sk_value, (const STACK *s, int n), (s, n) );
 
 SSL_DEF_VOID( RAND_seed, (const void *buf,int num), (buf, num) );
 SSL_DEF( BIO *, BIO_new_socket, (int sock, int close_flag), (sock, close_flag) );
+SSL_DEF( BIO *, BIO_new_mem_buf, (void *buf, int len), (buf, len) );
+SSL_DEF( int, BIO_free, (BIO *a), (a) );
 SSL_DEF( long, SSL_CTX_ctrl, (SSL_CTX *ctx,int cmd, long larg, ssl_parg parg), (ctx,cmd,larg,parg) );
 SSL_DEF_VOID( SSL_CTX_set_verify, (SSL_CTX *ctx,int mode, int (*callback)(int, X509_STORE_CTX *)), (ctx,mode,callback) );
 SSL_DEF( int, SSL_CTX_load_verify_locations, (SSL_CTX *ctx, const char *CAfile, const char *CApath), (ctx, CAfile, CApath) );
@@ -145,11 +149,18 @@
 SSL_DEF( X509 *, X509_STORE_CTX_get_current_cert, (X509_STORE_CTX *ctx), (ctx) );
 SSL_DEF( X509_NAME *, X509_get_subject_name, (X509 *a), (a) );
 SSL_DEF( char *, X509_NAME_oneline, (X509_NAME *a,char *buf,int size), (a,buf,size) );
+SSL_DEF( void *, X509_get_ext_d2i, (X509 *x, int nid, int *crit, int *idx), (x, nid, crit, idx) );
+SSL_DEF_VOID( X509_free, (X509 *x), (x) );
 SSL_DEF( int, SSL_shutdown, (SSL *s), (s) );
+SSL_DEF( int, SSL_CTX_use_certificate, (SSL_CTX *ctx, X509 *x), (ctx, x) );
+SSL_DEF( int, SSL_CTX_use_PrivateKey, (SSL_CTX *ctx, EVP_PKEY *pk), (ctx, pk) );
 SSL_DEF_VOID( SSL_CTX_free, (SSL_CTX *ctx), (ctx) );
 SSL_DEF( RSA *, RSA_generate_key, (int bits, unsigned long e,void (*cb)(int,int,void *),void *cb_arg), (bits,e,cb,cb_arg) );
 SSL_DEF(SSL_METHOD *, TLSv1_client_method, (void), () );
 SSL_DEF(SSL_METHOD *, SSLv23_client_method, (void), () );
+SSL_DEF_VOID( EVP_PKEY_free, (EVP_PKEY *pk), (pk) );
+SSL_DEF( X509 *, PEM_read_bio_X509, (BIO *bp, X509 **x, pem_password_cb *cb, void *u), (bp, x, cb, u) );
+SSL_DEF( EVP_PKEY *, PEM_read_bio_PrivateKey, (BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u), (bp, x, cb, u) );
 
 SSL_DEF( unsigned long, ERR_get_error, (void), () );
 SSL_DEF( char *, ERR_error_string, (unsigned long e, char *p), (e, p) );
@@ -187,27 +198,33 @@
    if ( !gs_dllSll.Load(ssl_dll) )
       goto error;
 
-   SSL_LOOKUP(SSL_new );
-   SSL_LOOKUP(SSL_free );
-   SSL_LOOKUP(SSL_set_rfd );
-   SSL_LOOKUP(SSL_set_wfd );
-   SSL_LOOKUP(SSL_set_read_ahead );
-   SSL_LOOKUP(SSL_connect );
-   SSL_LOOKUP(SSL_read );
-   SSL_LOOKUP(SSL_write );
-   SSL_LOOKUP(SSL_pending );
-   SSL_LOOKUP(SSL_library_init );
-   SSL_LOOKUP(SSL_load_error_strings );
-   SSL_LOOKUP(SSL_CTX_new );
-   SSL_LOOKUP(SSL_CIPHER_get_name );
+   SSL_LOOKUP(SSL_new);
+   SSL_LOOKUP(SSL_free);
+   SSL_LOOKUP(SSL_set_rfd);
+   SSL_LOOKUP(SSL_set_wfd);
+   SSL_LOOKUP(SSL_set_read_ahead);
+   SSL_LOOKUP(SSL_connect);
+   SSL_LOOKUP(SSL_read);
+   SSL_LOOKUP(SSL_write);
+   SSL_LOOKUP(SSL_pending);
+   SSL_LOOKUP(SSL_library_init);
+   SSL_LOOKUP(SSL_load_error_strings);
+   SSL_LOOKUP(SSL_CTX_new);
+   SSL_LOOKUP(SSL_CTX_use_certificate);
+   SSL_LOOKUP(SSL_CTX_use_PrivateKey);
+   SSL_LOOKUP(SSL_CIPHER_get_name);
    SSL_LOOKUP(SSL_CIPHER_get_bits);
-   SSL_LOOKUP(SSL_get_current_cipher );
+   SSL_LOOKUP(SSL_get_current_cipher);
    SSL_LOOKUP(SSL_get_fd);
    SSL_LOOKUP(SSL_set_fd);
    SSL_LOOKUP(SSL_get_error);
    SSL_LOOKUP(SSL_get_peer_certificate);
+   SSL_LOOKUP(sk_num);
+   SSL_LOOKUP(sk_value);
    SSL_LOOKUP(RAND_seed);
    SSL_LOOKUP(BIO_new_socket);
+   SSL_LOOKUP(BIO_new_mem_buf);
+   SSL_LOOKUP(BIO_free);
    SSL_LOOKUP(SSL_CTX_ctrl);
    SSL_LOOKUP(SSL_CTX_set_verify);
    SSL_LOOKUP(SSL_CTX_load_verify_locations);
@@ -229,11 +246,16 @@
    SSL_LOOKUP(X509_STORE_CTX_get_current_cert);
    SSL_LOOKUP(X509_get_subject_name);
    SSL_LOOKUP(X509_NAME_oneline);
+   SSL_LOOKUP(X509_get_ext_d2i);
+   SSL_LOOKUP(X509_free);
    SSL_LOOKUP(SSL_shutdown);
    SSL_LOOKUP(SSL_CTX_free);
    SSL_LOOKUP(RSA_generate_key);
-   SSL_LOOKUP(TLSv1_client_method );
-   SSL_LOOKUP(SSLv23_client_method );
+   SSL_LOOKUP(TLSv1_client_method);
+   SSL_LOOKUP(SSLv23_client_method);
+   SSL_LOOKUP(EVP_PKEY_free);
+   SSL_LOOKUP(PEM_read_bio_X509);
+   SSL_LOOKUP(PEM_read_bio_PrivateKey);
 
    CRYPTO_LOOKUP(ERR_get_error);
    CRYPTO_LOOKUP(ERR_error_string);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642