Target added.

[openssl.git] / ssl / ssl_locl.h

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 7b9d29dfc0535fb5e3c2963c65ed0a1468c901f0..9a52bab254ab04696dfde2bff38970f3f748cf10 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -163,9 +163,9 @@
  * can be publicly accessed.
  * Use the according functions for cipher management instead.
  *
- * The bit mask hendling in the selection and sorting scheme in
+ * The bit mask handling in the selection and sorting scheme in
  * ssl_create_cipher_list() has only limited capabilities, reflecting
- * that the different entities within are mutually exclusiv:
+ * that the different entities within are mutually exclusive:
  * ONLY ONE BIT PER MASK CAN BE SET AT A TIME.
  */
 #define SSL_MKEY_MASK          0x0000001FL
@@ -212,14 +212,14 @@
 /* we have used 001fffff - 11 bits left to go */
 
 /*
- * Export and cipher strenght information. For each cipher we have to decide
+ * Export and cipher strength information. For each cipher we have to decide
  * whether it is exportable or not. This information is likely to change
  * over time, since the export control rules are no static technical issue.
  *
  * Independent of the export flag the cipher strength is sorted into classes.
  * SSL_EXP40 was denoting the 40bit US export limit of past times, which now
  * is at 56bit (SSL_EXP56). If the exportable cipher class is going to change
- * againg (eg. to 64bit) the use of "SSL_EXP*" becomes blurred even more,
+ * again (eg. to 64bit) the use of "SSL_EXP*" becomes blurred even more,
  * since SSL_EXP64 could be similar to SSL_LOW.
  * For this reason SSL_MICRO and SSL_MINI macros are included to widen the
  * namespace of SSL_LOW-SSL_HIGH to lower values. As development of speed
@@ -306,8 +306,8 @@ typedef struct cert_st
        {
        /* Current active set */
        CERT_PKEY *key; /* ALWAYS points to an element of the pkeys array
-                                        * Probably it would make more sense to store
-                                        * an index, not a pointer. */
+                        * Probably it would make more sense to store
+                        * an index, not a pointer. */
  
        /* The following masks are for the key and auth
         * algorithms that are supported by the certs below */
@@ -371,7 +371,7 @@ typedef struct sess_cert_st
 
 /* This is for the SSLv3/TLSv1.0 differences in crypto/hash stuff
  * It is a bit of a mess of functions, but hell, think of it as
- * an opaque strucute :-) */
+ * an opaque structure :-) */
 typedef struct ssl3_enc_method
        {
        int (*enc)(SSL *, int);
@@ -392,7 +392,7 @@ typedef struct ssl3_enc_method
 /* Used for holding the relevant compression methods loaded into SSL_CTX */
 typedef struct ssl3_comp_st
        {
-       int comp_id;    /* The identifer byte for this compression type */
+       int comp_id;    /* The identifier byte for this compression type */
        char *name;     /* Text name used for the compression type */
        COMP_METHOD *method; /* The method :-) */
        } SSL3_COMP;
@@ -468,6 +468,8 @@ int ssl2_shutdown(SSL *s);
 void   ssl2_clear(SSL *s);
 long   ssl2_ctrl(SSL *s,int cmd, long larg, char *parg);
 long   ssl2_ctx_ctrl(SSL_CTX *s,int cmd, long larg, char *parg);
+long   ssl2_callback_ctrl(SSL *s,int cmd, void (*fp)());
+long   ssl2_ctx_callback_ctrl(SSL_CTX *s,int cmd, void (*fp)());
 int    ssl2_pending(SSL *s);
 
 SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);
@@ -492,7 +494,6 @@ int ssl3_renegotiate(SSL *ssl);
 int ssl3_renegotiate_check(SSL *ssl); 
 int ssl3_dispatch_alert(SSL *s);
 int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len);
-int ssl3_part_read(SSL *s, int i);
 int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
 int ssl3_final_finish_mac(SSL *s, EVP_MD_CTX *ctx1, EVP_MD_CTX *ctx2,
        const char *sender, int slen,unsigned char *p);
@@ -515,6 +516,8 @@ int ssl3_shutdown(SSL *s);
 void   ssl3_clear(SSL *s);
 long   ssl3_ctrl(SSL *s,int cmd, long larg, char *parg);
 long   ssl3_ctx_ctrl(SSL_CTX *s,int cmd, long larg, char *parg);
+long   ssl3_callback_ctrl(SSL *s,int cmd, void (*fp)());
+long   ssl3_ctx_callback_ctrl(SSL_CTX *s,int cmd, void (*fp)());
 int    ssl3_pending(SSL *s);
 
 int ssl23_accept(SSL *s);
@@ -526,6 +529,7 @@ int tls1_new(SSL *s);
 void tls1_free(SSL *s);
 void tls1_clear(SSL *s);
 long tls1_ctrl(SSL *s,int cmd, long larg, char *parg);
+long tls1_callback_ctrl(SSL *s,int cmd, void (*fp)());
 SSL_METHOD *tlsv1_base_method(void );
 
 int ssl_init_wbio_buffer(SSL *s, int push);