Clean up prototypes (prepare for removing NOPROTO).
[openssl.git] / crypto / evp / evp.h
index 3ece7fb..21417b1 100644 (file)
@@ -1,5 +1,5 @@
 /* crypto/evp/evp.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -72,6 +72,9 @@ extern "C" {
 #if !defined(NO_SHA) || !defined(NO_SHA1)
 #include "sha.h"
 #endif
+#ifndef NO_RMD160
+#include "ripemd.h"
+#endif
 #ifndef NO_DES
 #include "des.h"
 #endif
@@ -81,9 +84,15 @@ extern "C" {
 #ifndef NO_RC2
 #include "rc2.h"
 #endif
+#ifndef NO_RC5
+#include "rc5.h"
+#endif
 #ifndef NO_BLOWFISH
 #include "blowfish.h"
 #endif
+#ifndef NO_CAST
+#include "cast.h"
+#endif
 #ifndef NO_IDEA
 #include "idea.h"
 #endif
@@ -91,12 +100,14 @@ extern "C" {
 #include "mdc2.h"
 #endif
 
-#define EVP_RC2_KEY_SIZE       16
-#define EVP_RC4_KEY_SIZE       16
-#define EVP_BLOWFISH_KEY_SIZE  16
-#define EVP_MAX_MD_SIZE                20
-#define EVP_MAX_KEY_LENGTH     24
-#define EVP_MAX_IV_LENGTH      8
+#define EVP_RC2_KEY_SIZE               16
+#define EVP_RC4_KEY_SIZE               16
+#define EVP_BLOWFISH_KEY_SIZE          16
+#define EVP_CAST5_KEY_SIZE             16
+#define EVP_RC5_32_12_16_KEY_SIZE      16
+#define EVP_MAX_MD_SIZE                        (16+20) /* The SSLv3 md5+sha1 type */
+#define EVP_MAX_KEY_LENGTH             24
+#define EVP_MAX_IV_LENGTH              8
 
 #ifndef NO_RSA
 #include "rsa.h"
@@ -132,10 +143,15 @@ extern "C" {
 #define EVP_PKEY_RSA   NID_rsaEncryption
 #define EVP_PKEY_RSA2  NID_rsa
 #define EVP_PKEY_DSA   NID_dsa
+#define EVP_PKEY_DSA1  NID_dsa_2
 #define EVP_PKEY_DSA2  NID_dsaWithSHA
 #define EVP_PKEY_DSA3  NID_dsaWithSHA1
+#define EVP_PKEY_DSA4  NID_dsaWithSHA1_2
 #define EVP_PKEY_DH    NID_dhKeyAgreement
 
+/* Type needs to be a bit field
+ * Sub-type needs to be for variations on the method, as in, can it do
+ * arbitary encryption.... */
 typedef struct evp_pkey_st
        {
        int type;
@@ -148,13 +164,82 @@ typedef struct evp_pkey_st
                struct dh_st *dh;       /* DH */
                } pkey;
        int save_parameters;
-#ifdef HEADER_STACK_H
-       STACK /* X509_ATTRIBUTE */ *attributes; /* [ 0 ] */
-#else
-       char /* X509_ATTRIBUTE */ *attributes; /* [ 0 ] */
-#endif
+       STACK /*X509_ATTRIBUTE*/ *attributes; /* [ 0 ] */
        } EVP_PKEY;
 
+#define EVP_PKEY_MO_SIGN       0x0001
+#define EVP_PKEY_MO_VERIFY     0x0002
+#define EVP_PKEY_MO_ENCRYPT    0x0004
+#define EVP_PKEY_MO_DECRYPT    0x0008
+
+#if 0
+/* This structure is required to tie the message digest and signing together.
+ * The lookup can be done by md/pkey_method, oid, oid/pkey_method, or
+ * oid, md and pkey.
+ * This is required because for various smart-card perform the digest and
+ * signing/verification on-board.  To handle this case, the specific
+ * EVP_MD and EVP_PKEY_METHODs need to be closely associated.
+ * When a PKEY is created, it will have a EVP_PKEY_METHOD associated with it.
+ * This can either be software or a token to provide the required low level
+ * routines.
+ */
+typedef struct evp_pkey_md_st
+       {
+       int oid;
+       EVP_MD *md;
+       EVP_PKEY_METHOD *pkey;
+       } EVP_PKEY_MD;
+
+#define EVP_rsa_md2() \
+               EVP_PKEY_MD_add(NID_md2WithRSAEncryption,\
+                       EVP_rsa_pkcs1(),EVP_md2())
+#define EVP_rsa_md5() \
+               EVP_PKEY_MD_add(NID_md5WithRSAEncryption,\
+                       EVP_rsa_pkcs1(),EVP_md5())
+#define EVP_rsa_sha0() \
+               EVP_PKEY_MD_add(NID_shaWithRSAEncryption,\
+                       EVP_rsa_pkcs1(),EVP_sha())
+#define EVP_rsa_sha1() \
+               EVP_PKEY_MD_add(NID_sha1WithRSAEncryption,\
+                       EVP_rsa_pkcs1(),EVP_sha1())
+#define EVP_rsa_ripemd160() \
+               EVP_PKEY_MD_add(NID_ripemd160WithRSA,\
+                       EVP_rsa_pkcs1(),EVP_ripemd160())
+#define EVP_rsa_mdc2() \
+               EVP_PKEY_MD_add(NID_mdc2WithRSA,\
+                       EVP_rsa_octet_string(),EVP_mdc2())
+#define EVP_dsa_sha() \
+               EVP_PKEY_MD_add(NID_dsaWithSHA,\
+                       EVP_dsa(),EVP_mdc2())
+#define EVP_dsa_sha1() \
+               EVP_PKEY_MD_add(NID_dsaWithSHA1,\
+                       EVP_dsa(),EVP_sha1())
+
+typedef struct evp_pkey_method_st
+       {
+       char *name;
+       int flags;
+       int type;               /* RSA, DSA, an SSLeay specific constant */
+       int oid;                /* For the pub-key type */
+       int encrypt_oid;        /* pub/priv key encryption */
+
+       int (*sign)();
+       int (*verify)();
+       struct  {
+               int
+               int (*set)();   /* get and/or set the underlying type */
+               int (*get)();
+               int (*encrypt)();
+               int (*decrypt)();
+               int (*i2d)();
+               int (*d2i)();
+               int (*dup)();
+               } pub,priv;
+       int (*set_asn1_parameters)();
+       int (*get_asn1_parameters)();
+       } EVP_PKEY_METHOD;
+#endif
+
 #ifndef EVP_MD
 typedef struct env_md_st
        {
@@ -167,14 +252,19 @@ typedef struct env_md_st
 
        int (*sign)();
        int (*verify)();
-       int required_pkey_type[4]; /*EVP_PKEY_xxx */
+       int required_pkey_type[5]; /*EVP_PKEY_xxx */
+       int block_size;
+       int ctx_size; /* how big does the ctx need to be */
        } EVP_MD;
 
+
+
 #define EVP_PKEY_NULL_method   NULL,NULL,{0,0,0,0}
 
 #ifndef NO_DSA
 #define EVP_PKEY_DSA_method    DSA_sign,DSA_verify, \
-                               {EVP_PKEY_DSA,EVP_PKEY_DSA2,EVP_PKEY_DSA3,0}
+                               {EVP_PKEY_DSA,EVP_PKEY_DSA2,EVP_PKEY_DSA3, \
+                                       EVP_PKEY_DSA4,0}
 #else
 #define EVP_PKEY_DSA_method    EVP_PKEY_NULL_method
 #endif
@@ -195,7 +285,7 @@ typedef struct env_md_st
 
 typedef struct env_md_ctx_st
        {
-       EVP_MD *digest;
+       const EVP_MD *digest;
        union   {
                unsigned char base[4];
 #ifndef NO_MD2
@@ -204,6 +294,9 @@ typedef struct env_md_ctx_st
 #ifndef NO_MD5
                MD5_CTX md5;
 #endif
+#ifndef NO_RMD160
+               RIPEMD160_CTX ripemd160;
+#endif
 #if !defined(NO_SHA) || !defined(NO_SHA1)
                SHA_CTX sha;
 #endif
@@ -222,20 +315,30 @@ typedef struct evp_cipher_st
        void (*init)();         /* init for encryption */
        void (*do_cipher)();    /* encrypt data */
        void (*cleanup)();      /* used by cipher method */ 
+       int ctx_size;           /* how big the ctx needs to be */
+       /* int set_asn1_parameters(EVP_CIPHER_CTX,ASN1_TYPE *); */
+       int (*set_asn1_parameters)(); /* Populate a ASN1_TYPE with parameters */
+       /* int get_asn1_parameters(EVP_CIPHER_CTX,ASN1_TYPE *); */
+       int (*get_asn1_parameters)(); /* Get parameters from a ASN1_TYPE */
        } EVP_CIPHER;
 
 typedef struct evp_cipher_info_st
        {
-       EVP_CIPHER *cipher;
+       const EVP_CIPHER *cipher;
        unsigned char iv[EVP_MAX_IV_LENGTH];
        } EVP_CIPHER_INFO;
 
 typedef struct evp_cipher_ctx_st
        {
-       EVP_CIPHER *cipher;
+       const EVP_CIPHER *cipher;
        int encrypt;            /* encrypt or decrypt */
        int buf_len;            /* number we have left */
-       unsigned char buf[8];
+
+       unsigned char  oiv[EVP_MAX_IV_LENGTH];  /* original iv */
+       unsigned char  iv[EVP_MAX_IV_LENGTH];   /* working iv */
+       unsigned char buf[EVP_MAX_IV_LENGTH];   /* saved partial block */
+       int num;                                /* used by cfb/ofb mode */
+
        char *app_data;         /* aplication stuff */
        union   {
 #ifndef NO_RC4
@@ -246,102 +349,34 @@ typedef struct evp_cipher_ctx_st
                        } rc4;
 #endif
 #ifndef NO_DES
+               des_key_schedule des_ks;/* key schedule */
                struct
                        {
                        des_key_schedule ks;/* key schedule */
-                       } des_ecb;
-
-               struct
-                       {
-                       C_Block oiv;    /* original iv */
-                       C_Block iv;     /* working iv */
-                       des_key_schedule ks;/* key schedule */
-                       } des_cbc;
-
-               struct
-                       {
-                       C_Block oiv;    /* original iv */
-                       C_Block iv;     /* working iv */
                        C_Block inw;
                        C_Block outw;
-                       des_key_schedule ks;/* key schedule */
                        } desx_cbc;
-
                struct
                        {
-                       C_Block oiv;    /* original iv */
-                       C_Block iv;     /* working iv */
-                       des_key_schedule ks;/* key schedule */
+                       des_key_schedule ks1;/* key schedule */
                        des_key_schedule ks2;/* key schedule (for ede) */
                        des_key_schedule ks3;/* key schedule (for ede3) */
-                       int num;        /* used by cfb mode */
-                       } des_cfb;
-
-               struct
-                       {
-                       C_Block oiv;    /* original iv */
-                       C_Block iv;     /* working iv */
-                       des_key_schedule ks1;/* ksched 1 */
-                       des_key_schedule ks2;/* ksched 2 */
-                       des_key_schedule ks3;/* ksched 3 */
                        } des_ede;
 #endif
 #ifndef NO_IDEA
-               struct
-                       {
-                       IDEA_KEY_SCHEDULE ks;/* key schedule */
-                       } idea_ecb;
-               struct
-                       {
-                       unsigned char oiv[8];/* original iv */
-                       unsigned char iv[8]; /* working iv */
-                       IDEA_KEY_SCHEDULE ks;/* key schedule */
-                       } idea_cbc;
-               struct
-                       {
-                       unsigned char oiv[8];/* original iv */
-                       unsigned char iv[8]; /* working iv */
-                       IDEA_KEY_SCHEDULE ks;/* key schedule */
-                       int num;        /* used by cfb mode */
-                       } idea_cfb;
+               IDEA_KEY_SCHEDULE idea_ks;/* key schedule */
 #endif
 #ifndef NO_RC2
-               struct
-                       {
-                       RC2_KEY ks;/* key schedule */
-                       } rc2_ecb;
-               struct
-                       {
-                       unsigned char oiv[8];/* original iv */
-                       unsigned char iv[8]; /* working iv */
-                       RC2_KEY ks;/* key schedule */
-                       } rc2_cbc;
-               struct
-                       {
-                       unsigned char oiv[8];/* original iv */
-                       unsigned char iv[8]; /* working iv */
-                       RC2_KEY ks;/* key schedule */
-                       int num;        /* used by cfb mode */
-                       } rc2_cfb;
+               RC2_KEY rc2_ks;/* key schedule */
+#endif
+#ifndef NO_RC5
+               RC5_32_KEY rc5_ks;/* key schedule */
 #endif
 #ifndef NO_BLOWFISH
-               struct
-                       {
-                       BF_KEY ks;/* key schedule */
-                       } bf_ecb;
-               struct
-                       {
-                       unsigned char oiv[8];/* original iv */
-                       unsigned char iv[8]; /* working iv */
-                       BF_KEY ks;/* key schedule */
-                       } bf_cbc;
-               struct
-                       {
-                       unsigned char oiv[8];/* original iv */
-                       unsigned char iv[8]; /* working iv */
-                       BF_KEY ks;/* key schedule */
-                       int num;        /* used by cfb mode */
-                       } bf_cfb;
+               BF_KEY bf_ks;/* key schedule */
+#endif
+#ifndef NO_CAST
+               CAST_KEY cast_ks;/* key schedule */
 #endif
                } c;
        } EVP_CIPHER_CTX;
@@ -356,8 +391,14 @@ typedef struct evp_Encode_Ctx_st
                         * line is decoded */
        unsigned char enc_data[80];     /* data to encode */
        int line_num;   /* number read on current line */
+       int expect_nl;
        } EVP_ENCODE_CTX;
 
+/* Password based encryption function */
+typedef int (EVP_PBE_KEYGEN)(unsigned char *pass, int passlen,
+         unsigned char *salt,  int saltlen, int iter, EVP_CIPHER *cipher,
+                EVP_MD *md, unsigned char *key, unsigned char *iv);
+
 #define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
                                        (char *)(rsa))
 #define EVP_PKEY_assign_DSA(pkey,dsa) EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
@@ -374,7 +415,10 @@ typedef struct evp_Encode_Ctx_st
 #define EVP_MD_type(e)                 ((e)->type)
 #define EVP_MD_pkey_type(e)            ((e)->pkey_type)
 #define EVP_MD_size(e)                 ((e)->md_size)
-#define EVP_MD_CTX_size(e)             ((e)->digest->md_size)
+#define EVP_MD_block_size(e)           ((e)->block_size)
+
+#define EVP_MD_CTX_size(e)             EVP_MD_size((e)->digest)
+#define EVP_MD_CTX_block_size(e)       EVP_MD_block_size((e)->digest)
 #define EVP_MD_CTX_type(e)             ((e)->digest)
 
 #define EVP_CIPHER_nid(e)              ((e)->nid)
@@ -400,43 +444,57 @@ typedef struct evp_Encode_Ctx_st
 #define EVP_OpenUpdate(a,b,c,d,e)      EVP_DecryptUpdate(a,b,c,d,e)
 #define EVP_SealUpdate(a,b,c,d,e)      EVP_EncryptUpdate(a,b,c,d,e)    
 
-#define BIO_set_md(b,md)               BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md)
+#ifdef CONST_STRICT
+void BIO_set_md(BIO *,const EVP_MD *md);
+#else
+# define BIO_set_md(b,md)              BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md)
+#endif
 #define BIO_get_md(b,mdp)              BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)
 #define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)
 #define BIO_get_cipher_status(b)       BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
+#define BIO_get_cipher_ctx(b,c_pp)     BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)
 
 #define        EVP_Cipher(c,o,i,l)     (c)->cipher->do_cipher((c),(o),(i),(l))
 
+#define EVP_add_cipher_alias(n,alias) \
+       OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
+#define EVP_add_digest_alias(n,alias) \
+       OBJ_NAME_add((alias),OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,(n))
+#define EVP_delete_cipher_alias(alias) \
+       OBJ_NAME_remove(alias,OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS);
+#define EVP_delete_digest_alias(alias) \
+       OBJ_NAME_remove(alias,OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS);
+
 #ifndef NOPROTO
 
-void   EVP_DigestInit(EVP_MD_CTX *ctx, EVP_MD *type);
-void   EVP_DigestUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt);
+int     EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in);  
+void   EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
+void   EVP_DigestUpdate(EVP_MD_CTX *ctx,const unsigned char *d,
+                        unsigned int cnt);
 void   EVP_DigestFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s);
 
-int    EVP_read_pw_string(char *buf,int length,char *prompt,int verify);
+int    EVP_read_pw_string(char *buf,int length,const char *prompt,int verify);
 void   EVP_set_pw_prompt(char *prompt);
 char * EVP_get_pw_prompt(void);
 
-int    EVP_BytesToKey(EVP_CIPHER *type,EVP_MD *md,unsigned char *salt,
+int    EVP_BytesToKey(const EVP_CIPHER *type,EVP_MD *md,unsigned char *salt,
                unsigned char *data, int datal, int count,
                unsigned char *key,unsigned char *iv);
 
-EVP_CIPHER *EVP_get_cipherbyname(char *name);
-
-void   EVP_EncryptInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type,
+void   EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
                unsigned char *key, unsigned char *iv);
 void   EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
                int *outl, unsigned char *in, int inl);
 void   EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
 
-void   EVP_DecryptInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type,
+void   EVP_DecryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
                unsigned char *key, unsigned char *iv);
 void   EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
                int *outl, unsigned char *in, int inl);
 int    EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
 
-void   EVP_CipherInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type, unsigned char *key,
-               unsigned char *iv,int enc);
+void   EVP_CipherInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
+                      unsigned char *key,unsigned char *iv,int enc);
 void   EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
                int *outl, unsigned char *in, int inl);
 int    EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
@@ -471,13 +529,15 @@ int       EVP_DecodeBlock(unsigned char *t, unsigned
 
 void   ERR_load_EVP_strings(void );
 
+void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
 void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
 
 #ifdef HEADER_BIO_H
 BIO_METHOD *BIO_f_md(void);
 BIO_METHOD *BIO_f_base64(void);
 BIO_METHOD *BIO_f_cipher(void);
-void BIO_set_cipher(BIO *b,EVP_CIPHER *c,unsigned char *k,
+BIO_METHOD *BIO_f_reliable(void);
+void BIO_set_cipher(BIO *b,const EVP_CIPHER *c,unsigned char *k,
        unsigned char *i, int enc);
 #endif
 
@@ -489,6 +549,7 @@ EVP_MD *EVP_sha1(void);
 EVP_MD *EVP_dss(void);
 EVP_MD *EVP_dss1(void);
 EVP_MD *EVP_mdc2(void);
+EVP_MD *EVP_ripemd160(void);
 
 EVP_CIPHER *EVP_enc_null(void);                /* does nothing :-) */
 EVP_CIPHER *EVP_des_ecb(void);
@@ -505,18 +566,29 @@ EVP_CIPHER *EVP_des_ede_cbc(void);
 EVP_CIPHER *EVP_des_ede3_cbc(void);
 EVP_CIPHER *EVP_desx_cbc(void);
 EVP_CIPHER *EVP_rc4(void);
+EVP_CIPHER *EVP_rc4_40(void);
 EVP_CIPHER *EVP_idea_ecb(void);
 EVP_CIPHER *EVP_idea_cfb(void);
 EVP_CIPHER *EVP_idea_ofb(void);
 EVP_CIPHER *EVP_idea_cbc(void);
 EVP_CIPHER *EVP_rc2_ecb(void);
 EVP_CIPHER *EVP_rc2_cbc(void);
+EVP_CIPHER *EVP_rc2_40_cbc(void);
+EVP_CIPHER *EVP_rc2_64_cbc(void);
 EVP_CIPHER *EVP_rc2_cfb(void);
 EVP_CIPHER *EVP_rc2_ofb(void);
 EVP_CIPHER *EVP_bf_ecb(void);
 EVP_CIPHER *EVP_bf_cbc(void);
 EVP_CIPHER *EVP_bf_cfb(void);
 EVP_CIPHER *EVP_bf_ofb(void);
+EVP_CIPHER *EVP_cast5_ecb(void);
+EVP_CIPHER *EVP_cast5_cbc(void);
+EVP_CIPHER *EVP_cast5_cfb(void);
+EVP_CIPHER *EVP_cast5_ofb(void);
+EVP_CIPHER *EVP_rc5_32_12_16_cbc(void);
+EVP_CIPHER *EVP_rc5_32_12_16_ecb(void);
+EVP_CIPHER *EVP_rc5_32_12_16_cfb(void);
+EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
 
 void SSLeay_add_all_algorithms(void);
 void SSLeay_add_all_ciphers(void);
@@ -524,14 +596,17 @@ void SSLeay_add_all_digests(void);
 
 int EVP_add_cipher(EVP_CIPHER *cipher);
 int EVP_add_digest(EVP_MD *digest);
-int EVP_add_alias(char *name,char *alias);
-int EVP_delete_alias(char *name);
 
-EVP_CIPHER *EVP_get_cipherbyname(char *name);
-EVP_MD *EVP_get_digestbyname(char *name);
+const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
+const EVP_MD *EVP_get_digestbyname(const char *name);
 void EVP_cleanup(void);
 
+int            EVP_PKEY_decrypt(unsigned char *dec_key,unsigned char *enc_key,
+                       int enc_key_len,EVP_PKEY *private_key);
+int            EVP_PKEY_encrypt(unsigned char *enc_key,
+                       unsigned char *key,int key_len,EVP_PKEY *pub_key);
 int            EVP_PKEY_type(int type);
+int            EVP_PKEY_bits(EVP_PKEY *pkey);
 int            EVP_PKEY_size(EVP_PKEY *pkey);
 int            EVP_PKEY_assign(EVP_PKEY *pkey,int type,char *key);
 EVP_PKEY *     EVP_PKEY_new(void);
@@ -547,9 +622,19 @@ int                i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp);
 int EVP_PKEY_copy_parameters(EVP_PKEY *to,EVP_PKEY *from);
 int EVP_PKEY_missing_parameters(EVP_PKEY *pkey);
 int EVP_PKEY_save_parameters(EVP_PKEY *pkey,int mode);
+int EVP_PKEY_cmp_parameters(EVP_PKEY *a,EVP_PKEY *b);
+
+/* calls methods */
+int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
+int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
+
+/* These are used by EVP_CIPHER methods */
+int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type);
+int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type);
 
 #else
 
+int     EVP_MD_CTX_copy(); 
 void   EVP_DigestInit();
 void   EVP_DigestUpdate();
 void   EVP_DigestFinal();
@@ -596,12 +681,14 @@ int       EVP_DecodeBlock();
 
 void   ERR_load_EVP_strings();
 
+void EVP_CIPHER_CTX_init();
 void EVP_CIPHER_CTX_cleanup();
 
 #ifdef HEADER_BIO_H
 BIO_METHOD *BIO_f_md();
 BIO_METHOD *BIO_f_base64();
 BIO_METHOD *BIO_f_cipher();
+BIO_METHOD *BIO_f_reliable();
 void BIO_set_cipher();
 #endif
 
@@ -613,6 +700,7 @@ EVP_MD *EVP_sha1();
 EVP_MD *EVP_dss();
 EVP_MD *EVP_dss1();
 EVP_MD *EVP_mdc2();
+EVP_MD *EVP_ripemd160();
 
 EVP_CIPHER *EVP_enc_null();
 EVP_CIPHER *EVP_des_ecb();
@@ -629,18 +717,29 @@ EVP_CIPHER *EVP_des_ede_cbc();
 EVP_CIPHER *EVP_des_ede3_cbc();
 EVP_CIPHER *EVP_desx_cbc();
 EVP_CIPHER *EVP_rc4();
+EVP_CIPHER *EVP_rc4_40();
 EVP_CIPHER *EVP_idea_ecb();
 EVP_CIPHER *EVP_idea_cfb();
 EVP_CIPHER *EVP_idea_ofb();
 EVP_CIPHER *EVP_idea_cbc();
 EVP_CIPHER *EVP_rc2_ecb();
 EVP_CIPHER *EVP_rc2_cbc();
+EVP_CIPHER *EVP_rc2_40_cbc();
+EVP_CIPHER *EVP_rc2_64_cbc();
 EVP_CIPHER *EVP_rc2_cfb();
 EVP_CIPHER *EVP_rc2_ofb();
 EVP_CIPHER *EVP_bf_ecb();
 EVP_CIPHER *EVP_bf_cbc();
 EVP_CIPHER *EVP_bf_cfb();
 EVP_CIPHER *EVP_bf_ofb();
+EVP_CIPHER *EVP_cast5_ecb();
+EVP_CIPHER *EVP_cast5_cbc();
+EVP_CIPHER *EVP_cast5_cfb();
+EVP_CIPHER *EVP_cast5_ofb();
+EVP_CIPHER *EVP_rc5_32_12_16_cbc();
+EVP_CIPHER *EVP_rc5_32_12_16_ecb();
+EVP_CIPHER *EVP_rc5_32_12_16_cfb();
+EVP_CIPHER *EVP_rc5_32_12_16_ofb();
 
 void SSLeay_add_all_algorithms();
 void SSLeay_add_all_ciphers();
@@ -648,14 +747,15 @@ void SSLeay_add_all_digests();
 
 int EVP_add_cipher();
 int EVP_add_digest();
-int EVP_add_alias();
-int EVP_delete_alias();
 
 EVP_CIPHER *EVP_get_cipherbyname();
 EVP_MD *EVP_get_digestbyname();
 void EVP_cleanup();
 
+int            EVP_PKEY_decrypt();
+int            EVP_PKEY_encrypt();
 int            EVP_PKEY_type();
+int            EVP_PKEY_bits();
 int            EVP_PKEY_size();
 int            EVP_PKEY_assign();
 EVP_PKEY *     EVP_PKEY_new();
@@ -669,6 +769,13 @@ int                i2d_PrivateKey();
 int EVP_PKEY_copy_parameters();
 int EVP_PKEY_missing_parameters();
 int EVP_PKEY_save_parameters();
+int EVP_PKEY_cmp_parameters();
+
+int EVP_CIPHER_param_to_asn1();
+int EVP_CIPHER_asn1_to_param();
+
+int EVP_CIPHER_set_asn1_iv();
+int EVP_CIPHER_get_asn1_iv();
 
 #endif
 
@@ -678,24 +785,45 @@ int EVP_PKEY_save_parameters();
 /* Function codes. */
 #define EVP_F_D2I_PKEY                                  100
 #define EVP_F_EVP_DECRYPTFINAL                          101
+#define EVP_F_EVP_MD_CTX_COPY                           110
 #define EVP_F_EVP_OPENINIT                              102
+#define EVP_F_EVP_PBE_ALGOR_CIPHERINIT                  114
+#define EVP_F_EVP_PBE_ALG_ADD                           115
+#define EVP_F_EVP_PBE_CIPHERINIT                        116
+#define EVP_F_EVP_PKCS82PKEY                            111
+#define EVP_F_EVP_PKCS8_SET_BROKEN                      112
+#define EVP_F_EVP_PKEY2PKCS8                            113
 #define EVP_F_EVP_PKEY_COPY_PARAMETERS                  103
-#define EVP_F_EVP_PKEY_NEW                              104
-#define EVP_F_EVP_SEALINIT                              105
-#define EVP_F_EVP_SIGNFINAL                             106
-#define EVP_F_EVP_VERIFYFINAL                           107
+#define EVP_F_EVP_PKEY_DECRYPT                          104
+#define EVP_F_EVP_PKEY_ENCRYPT                          105
+#define EVP_F_EVP_PKEY_NEW                              106
+#define EVP_F_EVP_SIGNFINAL                             107
+#define EVP_F_EVP_VERIFYFINAL                           108
+#define EVP_F_RC2_MAGIC_TO_METH                                 109
 
 /* Reason codes. */
 #define EVP_R_BAD_DECRYPT                               100
+#define EVP_R_BN_DECODE_ERROR                           112
+#define EVP_R_BN_PUBKEY_ERROR                           113
+#define EVP_R_DECODE_ERROR                              114
 #define EVP_R_DIFFERENT_KEY_TYPES                       101
+#define EVP_R_ENCODE_ERROR                              115
+#define EVP_R_EVP_PBE_CIPHERINIT_ERROR                  119
+#define EVP_R_INPUT_NOT_INITIALIZED                     111
 #define EVP_R_IV_TOO_LARGE                              102
+#define EVP_R_KEYGEN_FAILURE                            120
 #define EVP_R_MISSING_PARMATERS                                 103
+#define EVP_R_NO_DSA_PARAMETERS                                 116
 #define EVP_R_NO_SIGN_FUNCTION_CONFIGURED               104
 #define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED             105
+#define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE                         117
 #define EVP_R_PUBLIC_KEY_NOT_RSA                        106
+#define EVP_R_UNKNOWN_PBE_ALGORITHM                     121
 #define EVP_R_UNSUPPORTED_CIPHER                        107
-#define EVP_R_WRONG_FINAL_BLOCK_LENGTH                  108
-#define EVP_R_WRONG_PUBLIC_KEY_TYPE                     109
+#define EVP_R_UNSUPPORTED_KEY_SIZE                      108
+#define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM                 118
+#define EVP_R_WRONG_FINAL_BLOCK_LENGTH                  109
+#define EVP_R_WRONG_PUBLIC_KEY_TYPE                     110
  
 #ifdef  __cplusplus
 }