From eafd6e5110b2e180ee449ac3bfb16952aa55a664 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 1 Jun 2008 21:18:47 +0000
Subject: [PATCH] Update error codes, move typedef of SSL, SSL_CTX to
 ossl_typ.h

---
 crypto/engine/eng_err.c  | 3 ++-
 crypto/engine/eng_pkey.c | 1 -
 crypto/engine/engine.h   | 1 +
 ssl/ssl.h                | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crypto/engine/eng_err.c b/crypto/engine/eng_err.c
index bc755ff050..466b8af190 100644
--- a/crypto/engine/eng_err.c
+++ b/crypto/engine/eng_err.c
@@ -1,6 +1,6 @@
 /* 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"},
diff --git a/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c
index 9b5169c46e..fd4c5e9ec3 100644
--- a/crypto/engine/eng_pkey.c
+++ b/crypto/engine/eng_pkey.c
@@ -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)
 		{
diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index 3a729020ce..5bf1e92c55 100644
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -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
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 471c63299e..3c1b74aa4b 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -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
 	{