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

« back to all changes in this revision

Viewing changes to crypto/x509/x_all.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
* 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:
95
95
                x->sig_alg, x->signature, x->cert_info,pkey,md));
96
96
        }
97
97
 
 
98
int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx)
 
99
        {
 
100
        return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CINF),
 
101
                x->cert_info->signature,
 
102
                x->sig_alg, x->signature, x->cert_info, ctx);
 
103
        }
 
104
 
98
105
int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
99
106
        {
100
107
        return(ASN1_item_sign(ASN1_ITEM_rptr(X509_REQ_INFO),x->sig_alg, NULL,
101
108
                x->signature, x->req_info,pkey,md));
102
109
        }
103
110
 
 
111
int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx)
 
112
        {
 
113
        return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_REQ_INFO),
 
114
                x->sig_alg, NULL, x->signature, x->req_info, ctx);
 
115
        }
 
116
 
104
117
int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
105
118
        {
106
119
        x->crl->enc.modified = 1;
108
121
                x->sig_alg, x->signature, x->crl,pkey,md));
109
122
        }
110
123
 
 
124
int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx)
 
125
        {
 
126
        return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CRL_INFO),
 
127
                x->crl->sig_alg, x->sig_alg, x->signature, x->crl, ctx);
 
128
        }
 
129
 
111
130
int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
112
131
        {
113
132
        return(ASN1_item_sign(ASN1_ITEM_rptr(NETSCAPE_SPKAC), x->sig_algor,NULL,