~ubuntu-branches/ubuntu/lucid/openssl/lucid-security

« back to all changes in this revision

Viewing changes to ssl/s2_enc.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2007-03-10 17:11:46 UTC
  • mto: (11.1.1 lenny)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20070310171146-uo85b7ii5pi1unm2
Tags: upstream-0.9.8e
ImportĀ upstreamĀ versionĀ 0.9.8e

Show diffs side-by-side

added added

removed removed

Lines of Context:
82
82
                ((s->enc_read_ctx=(EVP_CIPHER_CTX *)
83
83
                OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL))
84
84
                goto err;
 
85
 
 
86
        /* make sure it's intialized in case the malloc for enc_write_ctx fails
 
87
         * and we exit with an error */
 
88
        rs= s->enc_read_ctx;
 
89
        EVP_CIPHER_CTX_init(rs);
 
90
 
85
91
        if ((s->enc_write_ctx == NULL) &&
86
92
                ((s->enc_write_ctx=(EVP_CIPHER_CTX *)
87
93
                OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL))
88
94
                goto err;
89
95
 
90
 
        rs= s->enc_read_ctx;
91
96
        ws= s->enc_write_ctx;
92
 
 
93
 
        EVP_CIPHER_CTX_init(rs);
94
97
        EVP_CIPHER_CTX_init(ws);
95
98
 
96
99
        num=c->key_len;