← Back to branch summary

~ubuntu-branches/ubuntu/trusty/globus-gssapi-gsi/trusty

« back to all changes in this revision

Viewing changes to library/import_sec_context.c

  • Committer: Bazaar Package Importer
  • Author(s): Mattias Ellert
  • Date: 2011-04-26 07:29:28 UTC
  • Revision ID: james.westby@ubuntu.com-20110426072928-96lqrqtmmcz89ki0
Tags: 7.6-2
http://bugs.debian.org/616243
http://bugs.debian.org/621719
* Add README file
* Use new doxygen-latex build dependency (Closes: #616243)
* Remove calls to private openssl function - might cause problems,
  but at least it compiles (Closes: #621719)

Show diffs side-by-side

added added

removed removed

Lines of Context:
library/import_sec_context.c
34
34
#include "openssl/rand.h"
35
35
#include "openssl/ssl2.h"
36
36
#include "openssl/ssl3.h"
37
 
#include "globus_ssl_locl.h"
38
37
#include <string.h>
39
38
 
40
39
/**
200
199
        SSL_clear(ssl_handle);
201
200
    }
202
201
 
203
 
    /* we do this here, and later, since SSLeay-0.9.0 has a problem*/
204
 
    res = ssl3_setup_buffers(ssl_handle);
205
 
    if (!res)
206
 
    {
207
 
        GLOBUS_GSI_GSSAPI_OPENSSL_ERROR_RESULT(
208
 
            minor_status,
209
 
            GLOBUS_GSI_GSSAPI_ERROR_IMPEXP_BIO_SSL,
210
 
            (_GGSL("Couldn't initialize buffers in SSL handle")));
211
 
        major_status = GSS_S_FAILURE;
212
 
        goto exit;
213
 
    }
214
 
 
215
 
    res = ssl_init_wbio_buffer(ssl_handle, 0);
216
 
    if (!res)
217
 
    {  
218
 
        GLOBUS_GSI_GSSAPI_OPENSSL_ERROR_RESULT(
219
 
            minor_status,
220
 
            GLOBUS_GSI_GSSAPI_ERROR_IMPEXP_BIO_SSL,
221
 
            (_GGSL("Couldn't initialize write bio buffer in SSL handle")));
222
 
        major_status = GSS_S_FAILURE;
223
 
        goto exit; 
224
 
    } 
225
 
 
226
202
    session = d2i_SSL_SESSION_bio(bp, NULL);
227
203
 
228
204
    if (!session)
319
295
    GLOBUS_I_GSI_GSSAPI_DEBUG_PRINT_OBJECT(3, SSL_SESSION, session);
320
296
        
321
297
    SSL_set_session(ssl_handle, session);
322
 
        
323
 
    ssl_result = ssl3_setup_buffers(ssl_handle);
324
 
    if (!ssl_result)
325
 
    {
326
 
        GLOBUS_GSI_GSSAPI_OPENSSL_ERROR_RESULT(
327
 
            minor_status,
328
 
            GLOBUS_GSI_GSSAPI_ERROR_IMPEXP_BIO_SSL,
329
 
            (_GGSL("Couldn't setup buffers in SSL handle")));
330
 
        major_status = GSS_S_FAILURE;
331
 
        goto exit;
332
 
    }
333
298
 
334
299
    major_status = globus_i_gsi_gss_SSL_read_bio(
335
300
        &local_minor_status,