diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2001-10-27 09:03:00 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2001-10-27 09:03:00 +0000 |
| commit | c7f2c2739627057a47416f981fbed91444d4ecef (patch) | |
| tree | 4e88ec6c40038c357fc9ad154a073be6ce5df442 /lib/gnutls_session.c | |
| parent | de10598566b6b17b031f647941c2e4b73b049225 (diff) | |
| download | gnutls-c7f2c2739627057a47416f981fbed91444d4ecef.tar.gz | |
*** empty log message ***gnutls_0_2_9
Diffstat (limited to 'lib/gnutls_session.c')
| -rw-r--r-- | lib/gnutls_session.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/gnutls_session.c b/lib/gnutls_session.c index ed0ea76e34..ee6c6de7b9 100644 --- a/lib/gnutls_session.c +++ b/lib/gnutls_session.c @@ -45,7 +45,10 @@ int gnutls_get_current_session( GNUTLS_STATE state, opaque* session, int *sessio return 0; } memcpy( session, &state->security_parameters, sizeof(SecurityParameters)); - memcpy( &session[sizeof(SecurityParameters)], state->gnutls_key->auth_info, state->gnutls_key->auth_info_size); +/* memcpy( &session[sizeof(SecurityParameters)], state->gnutls_key->auth_info, state->gnutls_key->auth_info_size);*/ + memcpy( &session[sizeof(SecurityParameters)], &state->gnutls_key->auth_info_size, sizeof(state->gnutls_key->auth_info_size)); + memcpy( &session[sizeof(state->gnutls_key->auth_info_size)+sizeof(SecurityParameters)], + state->gnutls_key->auth_info, state->gnutls_key->auth_info_size); return 0; } @@ -94,6 +97,10 @@ int gnutls_set_current_session( GNUTLS_STATE state, opaque* session, int session int auth_info_size = session_size - sizeof(SecurityParameters); int timestamp = time(0); SecurityParameters sp; + + if (auth_info_size > sizeof(state->gnutls_key->auth_info_size)) { /* have more data */ + auth_info_size = *((int*)&session[sizeof(SecurityParameters)]); + } if (session_size < sizeof(SecurityParameters)) return GNUTLS_E_UNIMPLEMENTED_FEATURE; @@ -106,7 +113,11 @@ int gnutls_set_current_session( GNUTLS_STATE state, opaque* session, int session if (auth_info_size > 0) { state->gnutls_key->auth_info_size = auth_info_size; state->gnutls_key->auth_info = gnutls_malloc(auth_info_size); - memcpy( state->gnutls_key->auth_info, &session[sizeof(SecurityParameters)], auth_info_size); + if (state->gnutls_key->auth_info==NULL) { + gnutls_assert(); + return GNUTLS_E_MEMORY_ERROR; + } + memcpy( state->gnutls_key->auth_info, &session[sizeof(SecurityParameters)+sizeof(state->gnutls_key->auth_info_size)], auth_info_size); } else { /* set to null */ state->gnutls_key->auth_info_size = 0; state->gnutls_key->auth_info = NULL; |