diff options
author | Richard Levitte <levitte@openssl.org> | 2015-12-11 16:07:48 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2015-12-11 16:18:01 +0100 |
commit | a0be4fd17b1c7f5ab8f8e11c71d71a5dd20158f4 (patch) | |
tree | 867acd10d2210da3dce3d5a90f4dac6c213ce194 /include | |
parent | 1ee3b17fa0efc0505c157f537c976d188bfa25b3 (diff) | |
download | openssl-a0be4fd17b1c7f5ab8f8e11c71d71a5dd20158f4.tar.gz |
Make EVP_ENCODE_CTX opaque
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/evp.h | 19 | ||||
-rw-r--r-- | include/openssl/ossl_typ.h | 2 |
2 files changed, 5 insertions, 16 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 5126803087..40708f21ea 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -447,22 +447,6 @@ struct evp_cipher_ctx_st { unsigned char final[EVP_MAX_BLOCK_LENGTH]; /* possible final block */ } /* EVP_CIPHER_CTX */ ; -typedef struct evp_Encode_Ctx_st { - /* number saved in a partial encode/decode */ - int num; - /* - * The length is either the output line length (in input bytes) or the - * shortest input line length that is ok. Once decoding begins, the - * length is adjusted up each time a longer line is decoded - */ - int length; - /* data to encode */ - unsigned char enc_data[80]; - /* number read on current line */ - int line_num; - int expect_nl; -} EVP_ENCODE_CTX; - /* Password based encryption function */ typedef int (EVP_PBE_KEYGEN) (EVP_CIPHER_CTX *ctx, const char *pass, int passlen, ASN1_TYPE *param, @@ -701,6 +685,9 @@ __owur int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, EVP_PKEY **pubk, int npubk); __owur int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); +EVP_ENCODE_CTX *EVP_ENCODE_CTX_new(void); +void EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx); +int EVP_ENCODE_CTX_num(EVP_ENCODE_CTX *ctx); void EVP_EncodeInit(EVP_ENCODE_CTX *ctx); void EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl); diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h index a6d07a0bb3..ed7c2a853c 100644 --- a/include/openssl/ossl_typ.h +++ b/include/openssl/ossl_typ.h @@ -137,6 +137,8 @@ typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD; typedef struct evp_pkey_method_st EVP_PKEY_METHOD; typedef struct evp_pkey_ctx_st EVP_PKEY_CTX; +typedef struct evp_Encode_Ctx_st EVP_ENCODE_CTX; + typedef struct hmac_ctx_st HMAC_CTX; typedef struct dh_st DH; |