Add functionality to help making self-signed certificate.

[openssl.git] / crypto / evp / evp.h

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 7c333af4a97317b8de5373dc0f9a417f90fb1efc..4e4a667ab84d72f17f39fe981cdc485cebc00676 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -96,13 +96,13 @@
 #define EVP_PK_RSA     0x0001
 #define EVP_PK_DSA     0x0002
 #define EVP_PK_DH      0x0004
-#define EVP_PK_ECDSA   0x0008
+#define EVP_PK_EC      0x0008
 #define EVP_PKT_SIGN   0x0010
 #define EVP_PKT_ENC    0x0020
 #define EVP_PKT_EXCH   0x0040
 #define EVP_PKS_RSA    0x0100
 #define EVP_PKS_DSA    0x0200
-#define EVP_PKS_ECDSA  0x0400
+#define EVP_PKS_EC     0x0400
 #define EVP_PKT_EXP    0x1000 /* <= 512 bit key */
 
 #define EVP_PKEY_NONE  NID_undef
@@ -114,7 +114,7 @@
 #define EVP_PKEY_DSA3  NID_dsaWithSHA1
 #define EVP_PKEY_DSA4  NID_dsaWithSHA1_2
 #define EVP_PKEY_DH    NID_dhKeyAgreement
-#define EVP_PKEY_ECDSA NID_X9_62_id_ecPublicKey
+#define EVP_PKEY_EC    NID_X9_62_id_ecPublicKey
 
 #ifdef __cplusplus
 extern "C" {
@@ -139,8 +139,8 @@ struct evp_pkey_st
 #ifndef OPENSSL_NO_DH
                struct dh_st *dh;       /* DH */
 #endif
-#ifndef OPENSSL_NO_ECDSA
-               struct ecdsa_st *ecdsa; /* ECDSA */
+#ifndef OPENSSL_NO_EC
+               struct ec_key_st *eckey;/* ECC */
 #endif
                } pkey;
        int save_parameters;
@@ -255,7 +255,7 @@ struct env_md_st
 
 #ifndef OPENSSL_NO_ECDSA
 #define EVP_PKEY_ECDSA_method   ECDSA_sign,ECDSA_verify, \
-                                 {EVP_PKEY_ECDSA,0,0,0}
+                                 {EVP_PKEY_EC,0,0,0}
 #else   
 #define EVP_PKEY_ECDSA_method   EVP_PKEY_NULL_method
 #endif
@@ -400,9 +400,9 @@ typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                                        (char *)(dh))
 #endif
 
-#ifndef OPENSSL_NO_ECDSA
-#define EVP_PKEY_assign_ECDSA(pkey,ecdsa) EVP_PKEY_assign((pkey),EVP_PKEY_ECDSA,\
-                                        (char *)(ecdsa))
+#ifndef OPENSSL_NO_EC
+#define EVP_PKEY_assign_EC_KEY(pkey,eckey) EVP_PKEY_assign((pkey),EVP_PKEY_EC,\
+                                        (char *)(eckey))
 #endif
 
 /* Add some extra combinations */
@@ -601,6 +601,8 @@ const EVP_CIPHER *EVP_enc_null(void);               /* does nothing :-) */
 const EVP_CIPHER *EVP_des_ecb(void);
 const EVP_CIPHER *EVP_des_ede(void);
 const EVP_CIPHER *EVP_des_ede3(void);
+const EVP_CIPHER *EVP_des_ede_ecb(void);
+const EVP_CIPHER *EVP_des_ede3_ecb(void);
 const EVP_CIPHER *EVP_des_cfb(void);
 const EVP_CIPHER *EVP_des_ede_cfb(void);
 const EVP_CIPHER *EVP_des_ede3_cfb(void);
@@ -729,10 +731,10 @@ struct dh_st;
 int EVP_PKEY_set1_DH(EVP_PKEY *pkey,struct dh_st *key);
 struct dh_st *EVP_PKEY_get1_DH(EVP_PKEY *pkey);
 #endif
-#ifndef OPENSSL_NO_ECDSA
-struct ecdsa_st;
-int EVP_PKEY_set1_ECDSA(EVP_PKEY *pkey,struct ecdsa_st *key);
-struct ecdsa_st *EVP_PKEY_get1_ECDSA(EVP_PKEY *pkey);
+#ifndef OPENSSL_NO_EC
+struct ec_key_st;
+int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey,struct ec_key_st *key);
+struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey);
 #endif
 
 EVP_PKEY *     EVP_PKEY_new(void);
@@ -752,6 +754,8 @@ 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);
 
+int EVP_PKEY_cmp(EVP_PKEY *a,EVP_PKEY *b);
+
 int EVP_CIPHER_type(const EVP_CIPHER *ctx);
 
 /* calls methods */
@@ -792,6 +796,7 @@ void ERR_load_EVP_strings(void);
 /* Function codes. */
 #define EVP_F_D2I_PKEY                                  100
 #define EVP_F_ECDSA_PKEY2PKCS8                          129
+#define EVP_F_EC_KEY_PKEY2PKCS8                                 132
 #define EVP_F_EVP_CIPHERINIT                            123
 #define EVP_F_EVP_CIPHER_CTX_CTRL                       124
 #define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH             122
@@ -811,6 +816,7 @@ void ERR_load_EVP_strings(void);
 #define EVP_F_EVP_PKEY_GET1_DH                          119
 #define EVP_F_EVP_PKEY_GET1_DSA                                 120
 #define EVP_F_EVP_PKEY_GET1_ECDSA                       130
+#define EVP_F_EVP_PKEY_GET1_EC_KEY                      131
 #define EVP_F_EVP_PKEY_GET1_RSA                                 121
 #define EVP_F_EVP_PKEY_NEW                              106
 #define EVP_F_EVP_RIJNDAEL                              126
@@ -840,6 +846,7 @@ void ERR_load_EVP_strings(void);
 #define EVP_R_EXPECTING_A_DH_KEY                        128
 #define EVP_R_EXPECTING_A_DSA_KEY                       129
 #define EVP_R_EXPECTING_A_ECDSA_KEY                     141
+#define EVP_R_EXPECTING_A_EC_KEY                        142
 #define EVP_R_INITIALIZATION_ERROR                      134
 #define EVP_R_INPUT_NOT_INITIALIZED                     111
 #define EVP_R_INVALID_KEY_LENGTH                        130