More CVS ignore stuff...

[openssl.git] / ssl / ssl_locl.h

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 8c39d69712cdc26116927d27df9122a19d90fc7c..e4d783aa13491e16cb9849ce21145f47d0834e25 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -191,13 +191,13 @@
 #define SSL_SHA1               0x00040000L
 #define SSL_SHA                        (SSL_SHA1)
 
-#define _SSL_EXP_MASK          0x00300000L
+#define SSL_EXP_MASK           0x00300000L
 #define SSL_EXP40              0x00100000L
-#define _SSL_NOT_EXP           0x00200000L
+#define SSL_NOT_EXP            0x00200000L
 #define SSL_EXP56              0x00300000L
 #define SSL_IS_EXPORT(a)       ((a)&SSL_EXP40)
-#define SSL_IS_EXPORT56(a)     (((a)&_SSL_EXP_MASK) == SSL_EXP56)
-#define SSL_IS_EXPORT40(a)     (((a)&_SSL_EXP_MASK) == SSL_EXP40)
+#define SSL_IS_EXPORT56(a)     (((a)&SSL_EXP_MASK) == SSL_EXP56)
+#define SSL_IS_EXPORT40(a)     (((a)&SSL_EXP_MASK) == SSL_EXP40)
 #define SSL_C_IS_EXPORT(c)     SSL_IS_EXPORT((c)->algorithms)
 #define SSL_C_IS_EXPORT56(c)   SSL_IS_EXPORT56((c)->algorithms)
 #define SSL_C_IS_EXPORT40(c)   SSL_IS_EXPORT40((c)->algorithms)
@@ -219,7 +219,7 @@
 /* we have used 0fffffff - 4 bits left to go */
 #define SSL_ALL                        0xffffffffL
 #define SSL_ALL_CIPHERS                (SSL_MKEY_MASK|SSL_AUTH_MASK|SSL_ENC_MASK|\
-                               SSL_MAC_MASK|_SSL_EXP_MASK)
+                               SSL_MAC_MASK|SSL_EXP_MASK)
 
 /* Mostly for SSLv3 */
 #define SSL_PKEY_RSA_ENC       0
@@ -275,8 +275,8 @@ typedef struct cert_st
 
        RSA *rsa_tmp;
        DH *dh_tmp;
-       RSA *(*rsa_tmp_cb)();
-       DH *(*dh_tmp_cb)();
+       RSA *(*rsa_tmp_cb)(SSL *ssl,int export,int keysize);
+       DH *(*dh_tmp_cb)(SSL *ssl,int export,int keysize);
        CERT_PKEY pkeys[SSL_PKEY_NUM];
 
        STACK *cert_chain;
@@ -366,7 +366,7 @@ int ssl_undefined_function(SSL *s);
 X509 *ssl_get_server_send_cert(SSL *);
 EVP_PKEY *ssl_get_sign_pkey(SSL *,SSL_CIPHER *);
 int ssl_cert_type(X509 *x,EVP_PKEY *pkey);
-void ssl_set_cert_masks(CERT *c);
+void ssl_set_cert_masks(CERT *c,SSL_CIPHER *cipher);
 STACK *ssl_get_ciphers_by_id(SSL *s);
 int ssl_verify_alarm_type(long type);