Commit eafd6e51 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update error codes, move typedef of SSL, SSL_CTX to ossl_typ.h

parent 05935c47

crypto/engine/eng_err.c

+2 −1
Original line number Diff line number Diff line 
/* crypto/engine/eng_err.c */

/* ====================================================================

 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -94,6 +94,7 @@ static ERR_STRING_DATA ENGINE_str_functs[]= 
{ERR_FUNC(ENGINE_F_ENGINE_LIST_REMOVE),	"ENGINE_LIST_REMOVE"},

{ERR_FUNC(ENGINE_F_ENGINE_LOAD_PRIVATE_KEY),	"ENGINE_load_private_key"},

{ERR_FUNC(ENGINE_F_ENGINE_LOAD_PUBLIC_KEY),	"ENGINE_load_public_key"},

{ERR_FUNC(ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT),	"ENGINE_load_ssl_client_cert"},

{ERR_FUNC(ENGINE_F_ENGINE_NEW),	"ENGINE_new"},

{ERR_FUNC(ENGINE_F_ENGINE_REMOVE),	"ENGINE_remove"},

{ERR_FUNC(ENGINE_F_ENGINE_SET_DEFAULT_STRING),	"ENGINE_set_default_string"},

crypto/engine/eng_pkey.c

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s, 
	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,

	UI_METHOD *ui_method, void *callback_data)

	{

	int ret;



	if(e == NULL)

		{

crypto/engine/engine.h

+1 −0
Original line number Diff line number Diff line
@@ -765,6 +765,7 @@ void ERR_load_ENGINE_strings(void); 
#define ENGINE_F_ENGINE_LIST_REMOVE			 121

#define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY		 150

#define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY			 151

#define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT		 194

#define ENGINE_F_ENGINE_NEW				 122

#define ENGINE_F_ENGINE_REMOVE				 123

#define ENGINE_F_ENGINE_SET_DEFAULT_STRING		 189

ssl/ssl.h

+0 −3
Original line number Diff line number Diff line
@@ -377,9 +377,6 @@ typedef struct ssl_cipher_st 


DECLARE_STACK_OF(SSL_CIPHER)



typedef struct ssl_st SSL;

typedef struct ssl_ctx_st SSL_CTX;



/* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */

typedef struct ssl_method_st

	{