← Back to branch summary

~ubuntu-branches/ubuntu/vivid/wpasupplicant/vivid

« back to all changes in this revision

Viewing changes to tls_internal.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
http://bugs.debian.org/388316
* 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:
tls_internal.c
159
159
 
160
160
u8 * tls_connection_handshake(void *tls_ctx, struct tls_connection *conn,
161
161
                              const u8 *in_data, size_t in_len,
162
 
                              size_t *out_len)
 
162
                              size_t *out_len, u8 **appl_data,
 
163
                              size_t *appl_data_len)
163
164
{
 
165
        if (appl_data)
 
166
                *appl_data = NULL;
 
167
 
164
168
        printf("TLS: %s(in_data=%p in_len=%lu)\n",
165
169
               __func__, in_data, (unsigned long) in_len);
166
170
        return tlsv1_client_handshake(conn->client, in_data, in_len, out_len);
208
212
}
209
213
 
210
214
 
211
 
int tls_connection_set_anon_dh(void *tls_ctx, struct tls_connection *conn)
 
215
int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,
 
216
                                   u8 *ciphers)
212
217
{
213
 
        return tlsv1_client_set_anon_dh(conn->client);
 
218
        return tlsv1_client_set_cipher_list(conn->client, ciphers);
214
219
}
215
220
 
216
221