CVS gsasl/lib/src

[gsasl-commit]

Update of /home/cvs/gsasl/lib/src
In directory dopio:/tmp/cvs-serv3599

Modified Files:
        gsasl-compat.h 
Log Message:
Don't deprecate the types that are used in this file.


--- /home/cvs/gsasl/lib/src/gsasl-compat.h      2004/10/13 15:59:00     1.9
+++ /home/cvs/gsasl/lib/src/gsasl-compat.h      2004/10/13 16:17:02     1.10
@@ -58,99 +58,76 @@
 
 /* Callback prototypes */
 typedef int (*Gsasl_client_callback_anonymous) (Gsasl_session * sctx,
-                                               char *out, size_t * outlen)
-  __attribute__ ((deprecated));
+                                               char *out, size_t * outlen);
 typedef int (*Gsasl_client_callback_authentication_id) (Gsasl_session * sctx,
                                                        char *out,
-                                                       size_t * outlen)
-  __attribute__ ((deprecated));
+                                                       size_t * outlen);
 typedef int (*Gsasl_client_callback_authorization_id) (Gsasl_session * sctx,
                                                       char *out,
-                                                      size_t * outlen)
-  __attribute__ ((deprecated));
+                                                      size_t * outlen);
 typedef int (*Gsasl_client_callback_password) (Gsasl_session * sctx,
-                                              char *out, size_t * outlen)
-  __attribute__ ((deprecated));
+                                              char *out, size_t * outlen);
 typedef int (*Gsasl_client_callback_passcode) (Gsasl_session * sctx,
-                                              char *out, size_t * outlen)
-  __attribute__ ((deprecated));
+                                              char *out, size_t * outlen);
 typedef int (*Gsasl_client_callback_pin) (Gsasl_session * sctx,
                                          char *suggestion, char *out,
-                                         size_t * outlen)
-  __attribute__ ((deprecated));
+                                         size_t * outlen);
 typedef int (*Gsasl_client_callback_service) (Gsasl_session * sctx,
                                              char *service,
                                              size_t * servicelen,
                                              char *hostname,
                                              size_t * hostnamelen,
                                              char *servicename,
-                                             size_t * servicenamelen)
-  __attribute__ ((deprecated));
+                                             size_t * servicenamelen);
 typedef Gsasl_qop (*Gsasl_client_callback_qop) (Gsasl_session * sctx,
-                                               Gsasl_qop serverqops)
-  __attribute__ ((deprecated));
+                                               Gsasl_qop serverqops);
 typedef size_t (*Gsasl_client_callback_maxbuf) (Gsasl_session * sctx,
-                                               size_t servermaxbuf)
-  __attribute__ ((deprecated));
+                                               size_t servermaxbuf);
 typedef int (*Gsasl_client_callback_realm) (Gsasl_session * sctx, char *out,
-                                           size_t * outlen)
-  __attribute__ ((deprecated));
+                                           size_t * outlen);
 typedef int (*Gsasl_server_callback_retrieve) (Gsasl_session * sctx,
                                               const char *authentication_id,
                                               const char *authorization_id,
                                               const char *realm, char *key,
-                                              size_t * keylen)
-  __attribute__ ((deprecated));
+                                              size_t * keylen);
 typedef int (*Gsasl_server_callback_validate) (Gsasl_session * sctx,
                                               const char *authorization_id,
                                               const char *authentication_id,
-                                              const char *password)
-  __attribute__ ((deprecated));
+                                              const char *password);
 typedef int (*Gsasl_server_callback_gssapi) (Gsasl_session * sctx,
                                             const char *clientname,
-                                            const char *authentication_id)
-  __attribute__ ((deprecated));
+                                            const char *authentication_id);
 typedef int (*Gsasl_server_callback_securid) (Gsasl_session * sctx,
                                              const char *authentication_id,
                                              const char *authorization_id,
                                              const char *passcode, char *pin,
                                              char *suggestpin,
-                                             size_t * suggestpinlen)
-  __attribute__ ((deprecated));
+                                             size_t * suggestpinlen);
 typedef int (*Gsasl_server_callback_cram_md5) (Gsasl_session * sctx,
                                               char *username,
                                               char *challenge,
-                                              char *response)
-  __attribute__ ((deprecated));
+                                              char *response);
 typedef int (*Gsasl_server_callback_digest_md5) (Gsasl_session * sctx,
                                                 char *username, char *realm,
-                                                char *secrethash)
-  __attribute__ ((deprecated));
+                                                char *secrethash);
 typedef int (*Gsasl_server_callback_service) (Gsasl_session * sctx,
                                              char *service,
                                              size_t * servicelen,
                                              char *hostname,
-                                             size_t * hostnamelen)
-  __attribute__ ((deprecated));
-typedef int (*Gsasl_server_callback_external) (Gsasl_session * sctx)
-  __attribute__ ((deprecated));
+                                             size_t * hostnamelen);
+typedef int (*Gsasl_server_callback_external) (Gsasl_session * sctx);
 typedef int (*Gsasl_server_callback_anonymous) (Gsasl_session * sctx,
-                                               const char *token)
-  __attribute__ ((deprecated));
+                                               const char *token);
 typedef int (*Gsasl_server_callback_realm) (Gsasl_session * sctx, char *out,
-                                           size_t * outlen, size_t nth)
-  __attribute__ ((deprecated));
-typedef Gsasl_qop (*Gsasl_server_callback_qop) (Gsasl_session * sctx)
-  __attribute__ ((deprecated));
-typedef size_t (*Gsasl_server_callback_maxbuf) (Gsasl_session * sctx)
-  __attribute__ ((deprecated));
-typedef Gsasl_cipher (*Gsasl_server_callback_cipher) (Gsasl_session * sctx)
-  __attribute__ ((deprecated));
+                                           size_t * outlen, size_t nth);
+typedef Gsasl_qop (*Gsasl_server_callback_qop) (Gsasl_session * sctx);
+typedef size_t (*Gsasl_server_callback_maxbuf) (Gsasl_session * sctx);
+typedef Gsasl_cipher (*Gsasl_server_callback_cipher) (Gsasl_session * sctx);
 
 /* Obsolete client callbacks: callback-c.c */
 extern void
-  gsasl_client_callback_authorization_id_set
-  (Gsasl * ctx, Gsasl_client_callback_authorization_id cb)
+gsasl_client_callback_authorization_id_set
+(Gsasl * ctx, Gsasl_client_callback_authorization_id cb)
   __attribute__ ((deprecated));
 extern Gsasl_client_callback_authorization_id
 gsasl_client_callback_authorization_id_get (Gsasl * ctx)
@@ -318,44 +295,44 @@
                                                                        * ctx)
   __attribute__ ((deprecated));
 
-extern int gsasl_client_listmech (Gsasl_ctx * ctx, char *out,
+extern int gsasl_client_listmech (Gsasl * ctx, char *out,
                                  size_t * outlen)
   __attribute__ ((deprecated));
-extern int gsasl_server_listmech (Gsasl_ctx * ctx, char *out, size_t * outlen)
+extern int gsasl_server_listmech (Gsasl * ctx, char *out, size_t * outlen)
   __attribute__ ((deprecated));
-extern int gsasl_client_step (Gsasl_session_ctx * sctx, const char *input,
+extern int gsasl_client_step (Gsasl_session * sctx, const char *input,
                              size_t input_len, char *output,
                              size_t * output_len)
   __attribute__ ((deprecated));
-extern int gsasl_client_step_base64 (Gsasl_session_ctx * sctx,
+extern int gsasl_client_step_base64 (Gsasl_session * sctx,
                                     const char *b64input, char *b64output,
                                     size_t b64output_len)
   __attribute__ ((deprecated));
-extern int gsasl_server_step (Gsasl_session_ctx * sctx, const char *input,
+extern int gsasl_server_step (Gsasl_session * sctx, const char *input,
                              size_t input_len, char *output,
                              size_t * output_len)
   __attribute__ ((deprecated));
-extern int gsasl_server_step_base64 (Gsasl_session_ctx * sctx,
+extern int gsasl_server_step_base64 (Gsasl_session * sctx,
                                     const char *b64input, char *b64output,
                                     size_t b64output_len)
   __attribute__ ((deprecated));
-extern void gsasl_client_finish (Gsasl_session_ctx * sctx)
+extern void gsasl_client_finish (Gsasl_session * sctx)
   __attribute__ ((deprecated));
-extern void gsasl_server_finish (Gsasl_session_ctx * sctx)
+extern void gsasl_server_finish (Gsasl_session * sctx)
   __attribute__ ((deprecated));
-extern Gsasl_ctx *gsasl_client_ctx_get (Gsasl_session_ctx * sctx)
+extern Gsasl *gsasl_client_ctx_get (Gsasl_session * sctx)
   __attribute__ ((deprecated));
-extern Gsasl_ctx *gsasl_server_ctx_get (Gsasl_session_ctx * sctx)
+extern Gsasl *gsasl_server_ctx_get (Gsasl_session * sctx)
   __attribute__ ((deprecated));
-extern void gsasl_client_application_data_set (Gsasl_session_ctx * sctx,
+extern void gsasl_client_application_data_set (Gsasl_session * sctx,
                                               void *application_data)
   __attribute__ ((deprecated));
-extern void *gsasl_client_application_data_get (Gsasl_session_ctx * sctx)
+extern void *gsasl_client_application_data_get (Gsasl_session * sctx)
   __attribute__ ((deprecated));
-extern void gsasl_server_application_data_set (Gsasl_session_ctx * sctx,
+extern void gsasl_server_application_data_set (Gsasl_session * sctx,
                                               void *application_data)
   __attribute__ ((deprecated));
-extern void *gsasl_server_application_data_get (Gsasl_session_ctx * sctx)
+extern void *gsasl_server_application_data_get (Gsasl_session * sctx)
   __attribute__ ((deprecated));
 extern int gsasl_randomize (int strong, char *data, size_t datalen)
   __attribute__ ((deprecated));