← Back to branch summary

~ubuntu-branches/ubuntu/maverick/openssl/maverick

« back to all changes in this revision

Viewing changes to crypto/evp/evp_lib.c

  • Committer: Bazaar Package Importer
  • Author(s): Christoph Martin
  • Date: 2004-12-16 18:41:29 UTC
  • mto: (11.1.1 lenny)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20041216184129-z7xjkul57mh1jiha
Tags: upstream-0.9.7e
Import upstream version 0.9.7e

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/evp/evp_lib.c
68
68
        if (c->cipher->set_asn1_parameters != NULL)
69
69
                ret=c->cipher->set_asn1_parameters(c,type);
70
70
        else
71
 
                ret=1;
 
71
                return -1;
72
72
        return(ret);
73
73
        }
74
74
 
79
79
        if (c->cipher->get_asn1_parameters != NULL)
80
80
                ret=c->cipher->get_asn1_parameters(c,type);
81
81
        else
82
 
                ret=1;
 
82
                return -1;
83
83
        return(ret);
84
84
        }
85
85
 
133
133
 
134
134
                return NID_rc4;
135
135
 
 
136
                case NID_aes_128_cfb128:
 
137
                case NID_aes_128_cfb8:
 
138
                case NID_aes_128_cfb1:
 
139
 
 
140
                return NID_aes_128_cfb128;
 
141
 
 
142
                case NID_aes_192_cfb128:
 
143
                case NID_aes_192_cfb8:
 
144
                case NID_aes_192_cfb1:
 
145
 
 
146
                return NID_aes_192_cfb128;
 
147
 
 
148
                case NID_aes_256_cfb128:
 
149
                case NID_aes_256_cfb8:
 
150
                case NID_aes_256_cfb1:
 
151
 
 
152
                return NID_aes_256_cfb128;
 
153
 
 
154
                case NID_des_cfb64:
 
155
                case NID_des_cfb8:
 
156
                case NID_des_cfb1:
 
157
 
 
158
                return NID_des_cfb64;
 
159
 
136
160
                default:
137
161
                /* Check it has an OID and it is valid */
138
162
                otmp = OBJ_nid2obj(nid);