← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openssl/utopic

« back to all changes in this revision

Viewing changes to crypto/evp/p_sign.c

  • Committer: Package Import Robot
  • Author(s): Kurt Roeckx
  • Date: 2012-03-19 18:23:32 UTC
  • mfrom: (1.2.6)
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: package-import@ubuntu.com-20120319182332-q4zgqvw51ahauk27
Tags: 1.0.1-1
http://bugs.debian.org/644743
http://bugs.debian.org/663977
http://bugs.debian.org/653495
http://bugs.debian.org/664454
* New upstream version
  - Remove kfreebsd-pipe.patch, fixed upstream
  - Update pic.patch, openssl-pod-misspell.patch and make-targets.patch
  - Add OPENSSL_1.0.1 to version-script.patch and libssl1.0.0.symbols for
    the new functions.
  - AES-NI support (Closes: #644743)
* pic.patch: upstream made OPENSSL_ia32cap_P and OPENSSL_cpuid_setup
  hidden on amd64, no need to access it PIC anymore.
* pic.patch: Make OPENSSL_ia32cap_P hidden on i386 too (Closes: #663977)
* Enable hardening using dpkg-buildflags (Closes: #653495)
* s_client and s_server were forcing SSLv3 only connection when SSLv2 was
  disabled instead of the SSLv2 with upgrade method.  (Closes: #664454)
* Add Beaks on openssh < 1:5.9p1-4, it has a too strict version check.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/evp/p_sign.c
80
80
        {
81
81
        unsigned char m[EVP_MAX_MD_SIZE];
82
82
        unsigned int m_len;
83
 
        int i,ok=0,v;
 
83
        int i=0,ok=0,v;
84
84
        EVP_MD_CTX tmp_ctx;
 
85
        EVP_PKEY_CTX *pkctx = NULL;
85
86
 
86
87
        *siglen=0;
87
88
        EVP_MD_CTX_init(&tmp_ctx);
88
 
        EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);   
89
 
        EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len);
 
89
        if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
 
90
                goto err;  
 
91
        if (!EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len))
 
92
                goto err;
90
93
        EVP_MD_CTX_cleanup(&tmp_ctx);
91
94
 
92
95
        if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
93
96
                {
94
 
                EVP_PKEY_CTX *pkctx = NULL;
95
97
                size_t sltmp = (size_t)EVP_PKEY_size(pkey);
96
98
                i = 0;
97
99
                pkctx = EVP_PKEY_CTX_new(pkey, NULL);