← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/evp/p_dec.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2011-04-02 13:19:19 UTC
  • mfrom: (1.2.1 upstream) (11.2.2 experimental)
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: james.westby@ubuntu.com-20110402131919-anszuslper64ey9e
Tags: 1.0.0d-1
http://bugs.debian.org/607609
* New upstream version
  - Fixes CVE-2011-0014
* Make libssl-doc Replaces/Breaks with old libssl-dev packages
  (Closes: #607609)
* Only export the symbols we should, instead of all.
* Add symbol file.
* Upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/evp/p_dec.c
66
66
#include <openssl/objects.h>
67
67
#include <openssl/x509.h>
68
68
 
69
 
int EVP_PKEY_decrypt(unsigned char *key, const unsigned char *ek, int ekl,
 
69
int EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek, int ekl,
70
70
             EVP_PKEY *priv)
71
71
        {
72
72
        int ret= -1;
75
75
        if (priv->type != EVP_PKEY_RSA)
76
76
                {
77
77
#endif
78
 
                EVPerr(EVP_F_EVP_PKEY_DECRYPT,EVP_R_PUBLIC_KEY_NOT_RSA);
 
78
                EVPerr(EVP_F_EVP_PKEY_DECRYPT_OLD,EVP_R_PUBLIC_KEY_NOT_RSA);
79
79
#ifndef OPENSSL_NO_RSA
80
80
                goto err;
81
81
                }