~ubuntu-branches/ubuntu/lucid/wpasupplicant/lucid-updates

« back to all changes in this revision

Viewing changes to tls_gnutls.c

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2006-10-05 08:04:01 UTC
  • mfrom: (1.1.5 upstream) (3 etch)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20061005080401-r8lqlix4390yos7b
Tags: 0.5.5-2
* Update madwifi headers to latest SVN. (Closes: #388316)
* Remove failed attempt at action locking. [debian/functions.sh,
  debian/wpa_action.sh]
* Add hysteresis checking functions, to avoid "event loops" while
  using wpa-roam. [debian/functions.sh, debian/wpa_action.sh]
* Change of co-maintainer email address.
* Add ishex() function to functions.sh to determine wpa-psk value type in
  plaintext or hex. This effectively eliminates the need for the bogus and
  somewhat confusing wpa-passphrase contruct specific to our scripts and
  allows wpa-psk to work with either a 8 to 63 character long plaintext
  string or 64 character long hex string.
* Adjust README.modes to not refer to the redundant wpa-passphrase stuff.
* Add big fat NOTE about acceptable wpa-psk's to top of example gallery.
* Strip surrounding quotes from wpa-ssid if present, instead of just whining
  about them.
* Update email address in copyright blurb of functions.sh, ifupdown.sh and
  wpa_action.sh.  

Show diffs side-by-side

added added

removed removed

Lines of Context:
928
928
 
929
929
u8 * tls_connection_handshake(void *ssl_ctx, struct tls_connection *conn,
930
930
                              const u8 *in_data, size_t in_len,
931
 
                              size_t *out_len)
 
931
                              size_t *out_len, u8 **appl_data,
 
932
                              size_t *appl_data_len)
932
933
{
933
934
        struct tls_global *global = ssl_ctx;
934
935
        u8 *out_data;
935
936
        int ret;
936
937
 
 
938
        if (appl_data)
 
939
                *appl_data = NULL;
 
940
 
937
941
        if (in_data && in_len) {
938
942
                if (conn->pull_buf) {
939
943
                        wpa_printf(MSG_DEBUG, "%s - %d bytes remaining in "
1157
1161
}
1158
1162
 
1159
1163
 
1160
 
int tls_connection_set_anon_dh(void *ssl_ctx, struct tls_connection *conn)
 
1164
int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,
 
1165
                                   u8 *ciphers)
1161
1166
{
1162
 
        /* TODO: set ADH-AES128-SHA cipher */
 
1167
        /* TODO */
1163
1168
        return -1;
1164
1169
}
1165
1170