KNF.

6 files changed, 406 insertions, 416 deletions

diff --git a/src/lib/libcrypto/engine/eng_int.h b/src/lib/libcrypto/engine/eng_int.h
index 992cba676b..22049fd7fd 100644
--- a/src/lib/libcrypto/engine/eng_int.h
+++ b/src/lib/libcrypto/engine/eng_int.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_int.h,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_int.h,v 1.6 2014/06/22 12:16:28 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,7 +57,7 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
@@ -98,10 +98,9 @@ extern "C" {
  * order. NB: both the "add" functions assume CRYPTO_LOCK_ENGINE to already be
  * held (in "write" mode). */
 typedef void (ENGINE_CLEANUP_CB)(void);
-typedef struct st_engine_cleanup_item
-        {
+typedef struct st_engine_cleanup_item {
         ENGINE_CLEANUP_CB *cb;
-        } ENGINE_CLEANUP_ITEM;
+} ENGINE_CLEANUP_ITEM;
 DECLARE_STACK_OF(ENGINE_CLEANUP_ITEM)
 void engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb);
 void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb);
@@ -118,17 +117,20 @@ DECLARE_STACK_OF(ENGINE)
  * as a (ENGINE_TABLE *) pointer value set initially to NULL. */
 typedef struct st_engine_table ENGINE_TABLE;
 int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
-                ENGINE *e, const int *nids, int num_nids, int setdefault);
+    ENGINE *e, const int *nids, int num_nids, int setdefault);
 void engine_table_unregister(ENGINE_TABLE **table, ENGINE *e);
 void engine_table_cleanup(ENGINE_TABLE **table);
 #ifndef ENGINE_TABLE_DEBUG
 ENGINE *engine_table_select(ENGINE_TABLE **table, int nid);
 #else
-ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f, int l);
+ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f,
+    int l);
 #define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__)
 #endif
-typedef void (engine_table_doall_cb)(int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg);
-void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb, void *arg);
+typedef void (engine_table_doall_cb)(int nid, STACK_OF(ENGINE) *sk,
+    ENGINE *def, void *arg);
+void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb,
+    void *arg);
 
 /* Internal versions of API functions that have control over locking. These are
  * used between C files when functionality needs to be shared but the caller may
@@ -152,8 +154,7 @@ void engine_pkey_asn1_meths_free(ENGINE *e);
 
 /* This is a structure for storing implementations of various crypto
  * algorithms and functions. */
-struct engine_st
-        {
+struct engine_st {
         const char *id;
         const char *name;
         const RSA_METHOD *rsa_meth;
@@ -197,7 +198,7 @@ struct engine_st
         /* Used to maintain the linked-list of engines. */
         struct engine_st *prev;
         struct engine_st *next;
-        };
+};
 
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c
index 05ed61a38a..053767c646 100644
--- a/src/lib/libcrypto/engine/eng_list.c
+++ b/src/lib/libcrypto/engine/eng_list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_list.c,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_list.c,v 1.10 2014/06/22 12:15:53 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,7 +57,7 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
@@ -79,71 +79,64 @@ static ENGINE *engine_list_tail = NULL;
 /* This cleanup function is only needed internally. If it should be called, we
  * register it with the "ENGINE_cleanup()" stack to be called during cleanup. */
 
-static void engine_list_cleanup(void)
-        {
+static void
+engine_list_cleanup(void)
+{
         ENGINE *iterator = engine_list_head;
 
-        while(iterator != NULL)
-                {
+        while (iterator != NULL) {
                 ENGINE_remove(iterator);
                 iterator = engine_list_head;
-                }
-        return;
         }
+        return;
+}
 
 /* These static functions starting with a lower case "engine_" always
  * take place when CRYPTO_LOCK_ENGINE has been locked up. */
-static int engine_list_add(ENGINE *e)
-        {
+static int
+engine_list_add(ENGINE *e)
+{
         int conflict = 0;
         ENGINE *iterator = NULL;
 
-        if(e == NULL)
-                {
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_LIST_ADD,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         iterator = engine_list_head;
-        while(iterator && !conflict)
-                {
+        while (iterator && !conflict) {
                 conflict = (strcmp(iterator->id, e->id) == 0);
                 iterator = iterator->next;
-                }
-        if(conflict)
-                {
+        }
+        if (conflict) {
                 ENGINEerr(ENGINE_F_ENGINE_LIST_ADD,
-                        ENGINE_R_CONFLICTING_ENGINE_ID);
+                    ENGINE_R_CONFLICTING_ENGINE_ID);
                 return 0;
-                }
-        if(engine_list_head == NULL)
-                {
+        }
+        if (engine_list_head == NULL) {
                 /* We are adding to an empty list. */
-                if(engine_list_tail)
-                        {
+                if (engine_list_tail) {
                         ENGINEerr(ENGINE_F_ENGINE_LIST_ADD,
-                                ENGINE_R_INTERNAL_LIST_ERROR);
+                            ENGINE_R_INTERNAL_LIST_ERROR);
                         return 0;
-                        }
+                }
                 engine_list_head = e;
                 e->prev = NULL;
                 /* The first time the list allocates, we should register the
                  * cleanup. */
                 engine_cleanup_add_last(engine_list_cleanup);
-                }
-        else
-                {
+        } else {
                 /* We are adding to the tail of an existing list. */
-                if((engine_list_tail == NULL) ||
-                                (engine_list_tail->next != NULL))
-                        {
+                if ((engine_list_tail == NULL) ||
+                    (engine_list_tail->next != NULL)) {
                         ENGINEerr(ENGINE_F_ENGINE_LIST_ADD,
-                                ENGINE_R_INTERNAL_LIST_ERROR);
+                            ENGINE_R_INTERNAL_LIST_ERROR);
                         return 0;
-                        }
+                }
                 engine_list_tail->next = e;
                 e->prev = engine_list_tail;
-                }
+        }
         /* Having the engine in the list assumes a structural
          * reference. */
         e->struct_ref++;
@@ -152,169 +145,168 @@ static int engine_list_add(ENGINE *e)
         engine_list_tail = e;
         e->next = NULL;
         return 1;
-        }
+}
 
-static int engine_list_remove(ENGINE *e)
-        {
+static int
+engine_list_remove(ENGINE *e)
+{
         ENGINE *iterator;
 
-        if(e == NULL)
-                {
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_LIST_REMOVE,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         /* We need to check that e is in our linked list! */
         iterator = engine_list_head;
-        while(iterator && (iterator != e))
+        while (iterator && (iterator != e))
                 iterator = iterator->next;
-        if(iterator == NULL)
-                {
+        if (iterator == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_LIST_REMOVE,
-                        ENGINE_R_ENGINE_IS_NOT_IN_LIST);
+                    ENGINE_R_ENGINE_IS_NOT_IN_LIST);
                 return 0;
-                }
+        }
         /* un-link e from the chain. */
-        if(e->next)
+        if (e->next)
                 e->next->prev = e->prev;
-        if(e->prev)
+        if (e->prev)
                 e->prev->next = e->next;
         /* Correct our head/tail if necessary. */
-        if(engine_list_head == e)
+        if (engine_list_head == e)
                 engine_list_head = e->next;
-        if(engine_list_tail == e)
+        if (engine_list_tail == e)
                 engine_list_tail = e->prev;
         engine_free_util(e, 0);
         return 1;
-        }
+}
 
 /* Get the first/last "ENGINE" type available. */
-ENGINE *ENGINE_get_first(void)
-        {
+ENGINE *
+ENGINE_get_first(void)
+{
         ENGINE *ret;
 
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         ret = engine_list_head;
-        if(ret)
-                {
+        if (ret) {
                 ret->struct_ref++;
                 engine_ref_debug(ret, 0, 1)
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         return ret;
-        }
+}
 
-ENGINE *ENGINE_get_last(void)
-        {
+ENGINE *
+ENGINE_get_last(void)
+{
         ENGINE *ret;
 
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         ret = engine_list_tail;
-        if(ret)
-                {
+        if (ret) {
                 ret->struct_ref++;
                 engine_ref_debug(ret, 0, 1)
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         return ret;
-        }
+}
 
 /* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-ENGINE *ENGINE_get_next(ENGINE *e)
-        {
+ENGINE *
+ENGINE_get_next(ENGINE *e)
+{
         ENGINE *ret = NULL;
-        if(e == NULL)
-                {
+
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_GET_NEXT,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         ret = e->next;
-        if(ret)
-                {
+        if (ret) {
                 /* Return a valid structural refernce to the next ENGINE */
                 ret->struct_ref++;
                 engine_ref_debug(ret, 0, 1)
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         /* Release the structural reference to the previous ENGINE */
         ENGINE_free(e);
         return ret;
-        }
+}
 
-ENGINE *ENGINE_get_prev(ENGINE *e)
-        {
+ENGINE *
+ENGINE_get_prev(ENGINE *e)
+{
         ENGINE *ret = NULL;
-        if(e == NULL)
-                {
+
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_GET_PREV,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         ret = e->prev;
-        if(ret)
-                {
+        if (ret) {
                 /* Return a valid structural reference to the next ENGINE */
                 ret->struct_ref++;
                 engine_ref_debug(ret, 0, 1)
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         /* Release the structural reference to the previous ENGINE */
         ENGINE_free(e);
         return ret;
-        }
+}
 
 /* Add another "ENGINE" type into the list. */
-int ENGINE_add(ENGINE *e)
-        {
+int
+ENGINE_add(ENGINE *e)
+{
         int to_return = 1;
-        if(e == NULL)
-                {
+
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_ADD,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
-        if((e->id == NULL) || (e->name == NULL))
-                {
+        }
+        if ((e->id == NULL) || (e->name == NULL)) {
                 ENGINEerr(ENGINE_F_ENGINE_ADD,
-                        ENGINE_R_ID_OR_NAME_MISSING);
-                }
+                    ENGINE_R_ID_OR_NAME_MISSING);
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-        if(!engine_list_add(e))
-                {
+        if (!engine_list_add(e)) {
                 ENGINEerr(ENGINE_F_ENGINE_ADD,
-                        ENGINE_R_INTERNAL_LIST_ERROR);
+                    ENGINE_R_INTERNAL_LIST_ERROR);
                 to_return = 0;
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         return to_return;
-        }
+}
 
 /* Remove an existing "ENGINE" type from the array. */
-int ENGINE_remove(ENGINE *e)
-        {
+int
+ENGINE_remove(ENGINE *e)
+{
         int to_return = 1;
-        if(e == NULL)
-                {
+
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_REMOVE,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-        if(!engine_list_remove(e))
-                {
+        if (!engine_list_remove(e)) {
                 ENGINEerr(ENGINE_F_ENGINE_REMOVE,
-                        ENGINE_R_INTERNAL_LIST_ERROR);
+                    ENGINE_R_INTERNAL_LIST_ERROR);
                 to_return = 0;
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         return to_return;
-        }
+}
 
-static void engine_cpy(ENGINE *dest, const ENGINE *src)
-        {
+static void
+engine_cpy(ENGINE *dest, const ENGINE *src)
+{
         dest->id = src->id;
         dest->name = src->name;
 #ifndef OPENSSL_NO_RSA
@@ -345,86 +337,83 @@ static void engine_cpy(ENGINE *dest, const ENGINE *src)
         dest->load_pubkey = src->load_pubkey;
         dest->cmd_defns = src->cmd_defns;
         dest->flags = src->flags;
-        }
+}
 
-ENGINE *ENGINE_by_id(const char *id)
-        {
+ENGINE *
+ENGINE_by_id(const char *id)
+{
         ENGINE *iterator;
         char *load_dir = NULL;
-        if(id == NULL)
-                {
+
+        if (id == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_BY_ID,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return NULL;
-                }
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         iterator = engine_list_head;
-        while(iterator && (strcmp(id, iterator->id) != 0))
+        while (iterator && (strcmp(id, iterator->id) != 0))
                 iterator = iterator->next;
-        if(iterator)
-                {
+        if (iterator) {
                 /* We need to return a structural reference. If this is an
                  * ENGINE type that returns copies, make a duplicate - otherwise
                  * increment the existing ENGINE's reference count. */
-                if(iterator->flags & ENGINE_FLAGS_BY_ID_COPY)
-                        {
+                if (iterator->flags & ENGINE_FLAGS_BY_ID_COPY) {
                         ENGINE *cp = ENGINE_new();
-                        if(!cp)
+                        if (!cp)
                                 iterator = NULL;
-                        else
-                                {
+                        else {
                                 engine_cpy(cp, iterator);
                                 iterator = cp;
-                                }
                         }
-                else
-                        {
+                } else {
                         iterator->struct_ref++;
                         engine_ref_debug(iterator, 0, 1)
-                        }
                 }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
 #if 0
-        if(iterator == NULL)
-                {
+        if (iterator == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_BY_ID,
-                        ENGINE_R_NO_SUCH_ENGINE);
+                    ENGINE_R_NO_SUCH_ENGINE);
                 ERR_asprintf_error_data("id=%s", id);
-                }
+        }
         return iterator;
 #else
         /* EEK! Experimental code starts */
-        if(iterator) return iterator;
+        if (iterator)
+                return iterator;
         /* Prevent infinite recusrion if we're looking for the dynamic engine. */
-        if (strcmp(id, "dynamic"))
-                {
-                if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
+        if (strcmp(id, "dynamic")) {
+                if ((load_dir = getenv("OPENSSL_ENGINES")) == 0)
+                        load_dir = ENGINESDIR;
                 iterator = ENGINE_by_id("dynamic");
-                if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
-                                !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
-                                !ENGINE_ctrl_cmd_string(iterator, "DIR_ADD",
-                                        load_dir, 0) ||
-                                !ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) ||
-                                !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
-                                goto notfound;
+                if (!iterator ||
+                    !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
+                    !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
+                    !ENGINE_ctrl_cmd_string(iterator, "DIR_ADD", load_dir, 0) ||
+                    !ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) ||
+                    !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
+                        goto notfound;
                 return iterator;
-                }
+        }
+
 notfound:
         ENGINE_free(iterator);
-        ENGINEerr(ENGINE_F_ENGINE_BY_ID,ENGINE_R_NO_SUCH_ENGINE);
+        ENGINEerr(ENGINE_F_ENGINE_BY_ID, ENGINE_R_NO_SUCH_ENGINE);
         ERR_asprintf_error_data("id=%s", id);
         return NULL;
         /* EEK! Experimental code ends */
 #endif
-        }
+}
 
-int ENGINE_up_ref(ENGINE *e)
-        {
-        if (e == NULL)
-                {
-                ENGINEerr(ENGINE_F_ENGINE_UP_REF,ERR_R_PASSED_NULL_PARAMETER);
+int
+ENGINE_up_ref(ENGINE *e)
+{
+        if (e == NULL) {
+                ENGINEerr(ENGINE_F_ENGINE_UP_REF, ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
-        CRYPTO_add(&e->struct_ref,1,CRYPTO_LOCK_ENGINE);
-        return 1;
         }
+        CRYPTO_add(&e->struct_ref, 1, CRYPTO_LOCK_ENGINE);
+        return 1;
+}
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index 6dfd0ad6d1..24d2c5eac5 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.h,v 1.28 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: engine.h,v 1.29 2014/06/22 12:16:28 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,7 +57,7 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
@@ -140,7 +140,7 @@ extern "C" {
  * the existing ENGINE's structural reference count. */
 #define ENGINE_FLAGS_BY_ID_COPY         (int)0x0004
 
-/* This flag if for an ENGINE that does not want its methods registered as 
+/* This flag if for an ENGINE that does not want its methods registered as
  * part of ENGINE_register_all_complete() for example if the methods are
  * not usable as default methods.
  */
@@ -254,26 +254,27 @@ extern "C" {
  * array). NB: The array must be ordered in increasing order of cmd_num.
  * "null-terminated" means that the last ENGINE_CMD_DEFN element has cmd_num set
  * to zero and/or cmd_name set to NULL. */
-typedef struct ENGINE_CMD_DEFN_st
-        {
+typedef struct ENGINE_CMD_DEFN_st {
         unsigned int cmd_num; /* The command number */
         const char *cmd_name; /* The command name itself */
         const char *cmd_desc; /* A short description of the command */
         unsigned int cmd_flags; /* The input the command expects */
-        } ENGINE_CMD_DEFN;
+} ENGINE_CMD_DEFN;
 
 /* Generic function pointer */
 typedef int (*ENGINE_GEN_FUNC_PTR)(void);
 /* Generic function pointer taking no arguments */
 typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
 /* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *, void (*f)(void));
+typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *,
+    void (*f)(void));
 /* Generic load_key function pointer */
 typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-        UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
-        STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,
-        STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);
+    STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,
+    STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);
+
 /* These callback types are for an ENGINE's handler for cipher and digest logic.
  * These handlers have these prototypes;
  *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
@@ -286,10 +287,14 @@ typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
  */
 /* Returns to a pointer to the array of supported cipher 'nid's. If the second
  * parameter is non-NULL it is set to the size of the returned array. */
-typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **, const int **, int);
+typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **,
+    const int **, int);
 typedef int (*ENGINE_DIGESTS_PTR)(ENGINE *, const EVP_MD **, const int **, int);
-typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **, const int **, int);
-typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **, const int **, int);
+typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **,
+    const int **, int);
+typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **,
+    const int **, int);
+
 /* STRUCTURE functions ... all of these functions deal with pointers to ENGINE
  * structures where the pointers have a "structural reference". This means that
  * their reference is to allowed access to the structure but it does not imply
@@ -405,7 +410,7 @@ int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
  * See the comment on ENGINE_ctrl_cmd_string() for an explanation on how to
  * use the cmd_name and cmd_optional. */
 int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-        long i, void *p, void (*f)(void), int cmd_optional);
+    long i, void *p, void (*f)(void), int cmd_optional);
 
 /* This function passes a command-name and argument to an ENGINE. The cmd_name
  * is converted to a command number and the control command is called using
@@ -427,7 +432,7 @@ int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
  * compliant ENGINE-based applications can work consistently with the same
  * configuration for the same ENGINE-enabled devices, across applications. */
 int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-                                int cmd_optional);
+    int cmd_optional);
 
 /* These functions are useful for manufacturing new ENGINE structures. They
  * don't address reference counting at all - one uses them to populate an ENGINE
@@ -454,7 +459,7 @@ int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
 int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f);
 int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
 int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-                                ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
+    ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
 int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
 int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
 int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
@@ -463,7 +468,7 @@ int ENGINE_set_flags(ENGINE *e, int flags);
 int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
 /* These functions allow control over any per-structure ENGINE data. */
 int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+    CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
 void *ENGINE_get_ex_data(const ENGINE *e, int idx);
 
@@ -502,9 +507,9 @@ const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
 const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
 const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
 const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-                                        const char *str, int len);
+    const char *str, int len);
 const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-                                        const char *str, int len);
+    const char *str, int len);
 const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
 int ENGINE_get_flags(const ENGINE *e);
 
@@ -533,13 +538,13 @@ int ENGINE_finish(ENGINE *e);
  * location, handled by the engine.  The storage may be on a card or
  * whatever. */
 EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
-        STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,
-        STACK_OF(X509) **pother,
-        UI_METHOD *ui_method, void *callback_data);
+    STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,
+    STACK_OF(X509) **pother,
+    UI_METHOD *ui_method, void *callback_data);
 
 /* This returns a pointer for the current ENGINE structure that
  * is (by default) performing any RSA operations. The value returned
@@ -614,24 +619,24 @@ typedef struct st_dynamic_MEM_fns {
         dyn_MEM_malloc_cb                       malloc_cb;
         dyn_MEM_realloc_cb                      realloc_cb;
         dyn_MEM_free_cb                         free_cb;
-        } dynamic_MEM_fns;
+} dynamic_MEM_fns;
 /* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use
  * these types so we (and any other dependant code) can simplify a bit?? */
-typedef void (*dyn_lock_locking_cb)(int,int,const char *,int);
-typedef int (*dyn_lock_add_lock_cb)(int*,int,int,const char *,int);
+typedef void (*dyn_lock_locking_cb)(int, int, const char *, int);
+typedef int (*dyn_lock_add_lock_cb)(int*, int, int, const char *, int);
 typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)(
-                                                const char *,int);
-typedef void (*dyn_dynlock_lock_cb)(int,struct CRYPTO_dynlock_value *,
-                                                const char *,int);
+    const char *, int);
+typedef void (*dyn_dynlock_lock_cb)(int, struct CRYPTO_dynlock_value *,
+    const char *, int);
 typedef void (*dyn_dynlock_destroy_cb)(struct CRYPTO_dynlock_value *,
-                                                const char *,int);
+    const char *, int);
 typedef struct st_dynamic_LOCK_fns {
         dyn_lock_locking_cb                     lock_locking_cb;
         dyn_lock_add_lock_cb                    lock_add_lock_cb;
         dyn_dynlock_create_cb                   dynlock_create_cb;
         dyn_dynlock_lock_cb                     dynlock_lock_cb;
         dyn_dynlock_destroy_cb                  dynlock_destroy_cb;
-        } dynamic_LOCK_fns;
+} dynamic_LOCK_fns;
 /* The top-level structure */
 typedef struct st_dynamic_fns {
         void                                    *static_state;
@@ -639,7 +644,7 @@ typedef struct st_dynamic_fns {
         const CRYPTO_EX_DATA_IMPL               *ex_data_fns;
         dynamic_MEM_fns                         mem_fns;
         dynamic_LOCK_fns                        lock_fns;
-        } dynamic_fns;
+} dynamic_fns;
 
 /* The version checking function should be of this prototype. NB: The
  * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading code.
@@ -673,7 +678,7 @@ typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
  * and returns an int value (zero for failure). 'fn' should have prototype;
  *    [static] int fn(ENGINE *e, const char *id); */
 typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
-                                const dynamic_fns *fns);
+    const dynamic_fns *fns);
 #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
         extern \
         int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
@@ -704,7 +709,7 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
  * detect this is to have a function that returns a pointer to some static data
  * and let the loading application and loaded ENGINE compare their respective
  * values. */
-void *ENGINE_get_static_state(void);
+                                        void *ENGINE_get_static_state(void);
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/src/lib/libssl/src/crypto/engine/eng_int.h b/src/lib/libssl/src/crypto/engine/eng_int.h
index 992cba676b..22049fd7fd 100644
--- a/src/lib/libssl/src/crypto/engine/eng_int.h
+++ b/src/lib/libssl/src/crypto/engine/eng_int.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_int.h,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_int.h,v 1.6 2014/06/22 12:16:28 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,7 +57,7 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
@@ -98,10 +98,9 @@ extern "C" {
  * order. NB: both the "add" functions assume CRYPTO_LOCK_ENGINE to already be
  * held (in "write" mode). */
 typedef void (ENGINE_CLEANUP_CB)(void);
-typedef struct st_engine_cleanup_item
-        {
+typedef struct st_engine_cleanup_item {
         ENGINE_CLEANUP_CB *cb;
-        } ENGINE_CLEANUP_ITEM;
+} ENGINE_CLEANUP_ITEM;
 DECLARE_STACK_OF(ENGINE_CLEANUP_ITEM)
 void engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb);
 void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb);
@@ -118,17 +117,20 @@ DECLARE_STACK_OF(ENGINE)
  * as a (ENGINE_TABLE *) pointer value set initially to NULL. */
 typedef struct st_engine_table ENGINE_TABLE;
 int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
-                ENGINE *e, const int *nids, int num_nids, int setdefault);
+    ENGINE *e, const int *nids, int num_nids, int setdefault);
 void engine_table_unregister(ENGINE_TABLE **table, ENGINE *e);
 void engine_table_cleanup(ENGINE_TABLE **table);
 #ifndef ENGINE_TABLE_DEBUG
 ENGINE *engine_table_select(ENGINE_TABLE **table, int nid);
 #else
-ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f, int l);
+ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f,
+    int l);
 #define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__)
 #endif
-typedef void (engine_table_doall_cb)(int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg);
-void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb, void *arg);
+typedef void (engine_table_doall_cb)(int nid, STACK_OF(ENGINE) *sk,
+    ENGINE *def, void *arg);
+void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb,
+    void *arg);
 
 /* Internal versions of API functions that have control over locking. These are
  * used between C files when functionality needs to be shared but the caller may
@@ -152,8 +154,7 @@ void engine_pkey_asn1_meths_free(ENGINE *e);
 
 /* This is a structure for storing implementations of various crypto
  * algorithms and functions. */
-struct engine_st
-        {
+struct engine_st {
         const char *id;
         const char *name;
         const RSA_METHOD *rsa_meth;
@@ -197,7 +198,7 @@ struct engine_st
         /* Used to maintain the linked-list of engines. */
         struct engine_st *prev;
         struct engine_st *next;
-        };
+};
 
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libssl/src/crypto/engine/eng_list.c b/src/lib/libssl/src/crypto/engine/eng_list.c
index 05ed61a38a..053767c646 100644
--- a/src/lib/libssl/src/crypto/engine/eng_list.c
+++ b/src/lib/libssl/src/crypto/engine/eng_list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_list.c,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_list.c,v 1.10 2014/06/22 12:15:53 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,7 +57,7 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
@@ -79,71 +79,64 @@ static ENGINE *engine_list_tail = NULL;
 /* This cleanup function is only needed internally. If it should be called, we
  * register it with the "ENGINE_cleanup()" stack to be called during cleanup. */
 
-static void engine_list_cleanup(void)
-        {
+static void
+engine_list_cleanup(void)
+{
         ENGINE *iterator = engine_list_head;
 
-        while(iterator != NULL)
-                {
+        while (iterator != NULL) {
                 ENGINE_remove(iterator);
                 iterator = engine_list_head;
-                }
-        return;
         }
+        return;
+}
 
 /* These static functions starting with a lower case "engine_" always
  * take place when CRYPTO_LOCK_ENGINE has been locked up. */
-static int engine_list_add(ENGINE *e)
-        {
+static int
+engine_list_add(ENGINE *e)
+{
         int conflict = 0;
         ENGINE *iterator = NULL;
 
-        if(e == NULL)
-                {
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_LIST_ADD,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         iterator = engine_list_head;
-        while(iterator && !conflict)
-                {
+        while (iterator && !conflict) {
                 conflict = (strcmp(iterator->id, e->id) == 0);
                 iterator = iterator->next;
-                }
-        if(conflict)
-                {
+        }
+        if (conflict) {
                 ENGINEerr(ENGINE_F_ENGINE_LIST_ADD,
-                        ENGINE_R_CONFLICTING_ENGINE_ID);
+                    ENGINE_R_CONFLICTING_ENGINE_ID);
                 return 0;
-                }
-        if(engine_list_head == NULL)
-                {
+        }
+        if (engine_list_head == NULL) {
                 /* We are adding to an empty list. */
-                if(engine_list_tail)
-                        {
+                if (engine_list_tail) {
                         ENGINEerr(ENGINE_F_ENGINE_LIST_ADD,
-                                ENGINE_R_INTERNAL_LIST_ERROR);
+                            ENGINE_R_INTERNAL_LIST_ERROR);
                         return 0;
-                        }
+                }
                 engine_list_head = e;
                 e->prev = NULL;
                 /* The first time the list allocates, we should register the
                  * cleanup. */
                 engine_cleanup_add_last(engine_list_cleanup);
-                }
-        else
-                {
+        } else {
                 /* We are adding to the tail of an existing list. */
-                if((engine_list_tail == NULL) ||
-                                (engine_list_tail->next != NULL))
-                        {
+                if ((engine_list_tail == NULL) ||
+                    (engine_list_tail->next != NULL)) {
                         ENGINEerr(ENGINE_F_ENGINE_LIST_ADD,
-                                ENGINE_R_INTERNAL_LIST_ERROR);
+                            ENGINE_R_INTERNAL_LIST_ERROR);
                         return 0;
-                        }
+                }
                 engine_list_tail->next = e;
                 e->prev = engine_list_tail;
-                }
+        }
         /* Having the engine in the list assumes a structural
          * reference. */
         e->struct_ref++;
@@ -152,169 +145,168 @@ static int engine_list_add(ENGINE *e)
         engine_list_tail = e;
         e->next = NULL;
         return 1;
-        }
+}
 
-static int engine_list_remove(ENGINE *e)
-        {
+static int
+engine_list_remove(ENGINE *e)
+{
         ENGINE *iterator;
 
-        if(e == NULL)
-                {
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_LIST_REMOVE,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         /* We need to check that e is in our linked list! */
         iterator = engine_list_head;
-        while(iterator && (iterator != e))
+        while (iterator && (iterator != e))
                 iterator = iterator->next;
-        if(iterator == NULL)
-                {
+        if (iterator == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_LIST_REMOVE,
-                        ENGINE_R_ENGINE_IS_NOT_IN_LIST);
+                    ENGINE_R_ENGINE_IS_NOT_IN_LIST);
                 return 0;
-                }
+        }
         /* un-link e from the chain. */
-        if(e->next)
+        if (e->next)
                 e->next->prev = e->prev;
-        if(e->prev)
+        if (e->prev)
                 e->prev->next = e->next;
         /* Correct our head/tail if necessary. */
-        if(engine_list_head == e)
+        if (engine_list_head == e)
                 engine_list_head = e->next;
-        if(engine_list_tail == e)
+        if (engine_list_tail == e)
                 engine_list_tail = e->prev;
         engine_free_util(e, 0);
         return 1;
-        }
+}
 
 /* Get the first/last "ENGINE" type available. */
-ENGINE *ENGINE_get_first(void)
-        {
+ENGINE *
+ENGINE_get_first(void)
+{
         ENGINE *ret;
 
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         ret = engine_list_head;
-        if(ret)
-                {
+        if (ret) {
                 ret->struct_ref++;
                 engine_ref_debug(ret, 0, 1)
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         return ret;
-        }
+}
 
-ENGINE *ENGINE_get_last(void)
-        {
+ENGINE *
+ENGINE_get_last(void)
+{
         ENGINE *ret;
 
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         ret = engine_list_tail;
-        if(ret)
-                {
+        if (ret) {
                 ret->struct_ref++;
                 engine_ref_debug(ret, 0, 1)
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         return ret;
-        }
+}
 
 /* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-ENGINE *ENGINE_get_next(ENGINE *e)
-        {
+ENGINE *
+ENGINE_get_next(ENGINE *e)
+{
         ENGINE *ret = NULL;
-        if(e == NULL)
-                {
+
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_GET_NEXT,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         ret = e->next;
-        if(ret)
-                {
+        if (ret) {
                 /* Return a valid structural refernce to the next ENGINE */
                 ret->struct_ref++;
                 engine_ref_debug(ret, 0, 1)
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         /* Release the structural reference to the previous ENGINE */
         ENGINE_free(e);
         return ret;
-        }
+}
 
-ENGINE *ENGINE_get_prev(ENGINE *e)
-        {
+ENGINE *
+ENGINE_get_prev(ENGINE *e)
+{
         ENGINE *ret = NULL;
-        if(e == NULL)
-                {
+
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_GET_PREV,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         ret = e->prev;
-        if(ret)
-                {
+        if (ret) {
                 /* Return a valid structural reference to the next ENGINE */
                 ret->struct_ref++;
                 engine_ref_debug(ret, 0, 1)
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         /* Release the structural reference to the previous ENGINE */
         ENGINE_free(e);
         return ret;
-        }
+}
 
 /* Add another "ENGINE" type into the list. */
-int ENGINE_add(ENGINE *e)
-        {
+int
+ENGINE_add(ENGINE *e)
+{
         int to_return = 1;
-        if(e == NULL)
-                {
+
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_ADD,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
-        if((e->id == NULL) || (e->name == NULL))
-                {
+        }
+        if ((e->id == NULL) || (e->name == NULL)) {
                 ENGINEerr(ENGINE_F_ENGINE_ADD,
-                        ENGINE_R_ID_OR_NAME_MISSING);
-                }
+                    ENGINE_R_ID_OR_NAME_MISSING);
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-        if(!engine_list_add(e))
-                {
+        if (!engine_list_add(e)) {
                 ENGINEerr(ENGINE_F_ENGINE_ADD,
-                        ENGINE_R_INTERNAL_LIST_ERROR);
+                    ENGINE_R_INTERNAL_LIST_ERROR);
                 to_return = 0;
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         return to_return;
-        }
+}
 
 /* Remove an existing "ENGINE" type from the array. */
-int ENGINE_remove(ENGINE *e)
-        {
+int
+ENGINE_remove(ENGINE *e)
+{
         int to_return = 1;
-        if(e == NULL)
-                {
+
+        if (e == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_REMOVE,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-        if(!engine_list_remove(e))
-                {
+        if (!engine_list_remove(e)) {
                 ENGINEerr(ENGINE_F_ENGINE_REMOVE,
-                        ENGINE_R_INTERNAL_LIST_ERROR);
+                    ENGINE_R_INTERNAL_LIST_ERROR);
                 to_return = 0;
-                }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
         return to_return;
-        }
+}
 
-static void engine_cpy(ENGINE *dest, const ENGINE *src)
-        {
+static void
+engine_cpy(ENGINE *dest, const ENGINE *src)
+{
         dest->id = src->id;
         dest->name = src->name;
 #ifndef OPENSSL_NO_RSA
@@ -345,86 +337,83 @@ static void engine_cpy(ENGINE *dest, const ENGINE *src)
         dest->load_pubkey = src->load_pubkey;
         dest->cmd_defns = src->cmd_defns;
         dest->flags = src->flags;
-        }
+}
 
-ENGINE *ENGINE_by_id(const char *id)
-        {
+ENGINE *
+ENGINE_by_id(const char *id)
+{
         ENGINE *iterator;
         char *load_dir = NULL;
-        if(id == NULL)
-                {
+
+        if (id == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_BY_ID,
-                        ERR_R_PASSED_NULL_PARAMETER);
+                    ERR_R_PASSED_NULL_PARAMETER);
                 return NULL;
-                }
+        }
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
         iterator = engine_list_head;
-        while(iterator && (strcmp(id, iterator->id) != 0))
+        while (iterator && (strcmp(id, iterator->id) != 0))
                 iterator = iterator->next;
-        if(iterator)
-                {
+        if (iterator) {
                 /* We need to return a structural reference. If this is an
                  * ENGINE type that returns copies, make a duplicate - otherwise
                  * increment the existing ENGINE's reference count. */
-                if(iterator->flags & ENGINE_FLAGS_BY_ID_COPY)
-                        {
+                if (iterator->flags & ENGINE_FLAGS_BY_ID_COPY) {
                         ENGINE *cp = ENGINE_new();
-                        if(!cp)
+                        if (!cp)
                                 iterator = NULL;
-                        else
-                                {
+                        else {
                                 engine_cpy(cp, iterator);
                                 iterator = cp;
-                                }
                         }
-                else
-                        {
+                } else {
                         iterator->struct_ref++;
                         engine_ref_debug(iterator, 0, 1)
-                        }
                 }
+        }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
 #if 0
-        if(iterator == NULL)
-                {
+        if (iterator == NULL) {
                 ENGINEerr(ENGINE_F_ENGINE_BY_ID,
-                        ENGINE_R_NO_SUCH_ENGINE);
+                    ENGINE_R_NO_SUCH_ENGINE);
                 ERR_asprintf_error_data("id=%s", id);
-                }
+        }
         return iterator;
 #else
         /* EEK! Experimental code starts */
-        if(iterator) return iterator;
+        if (iterator)
+                return iterator;
         /* Prevent infinite recusrion if we're looking for the dynamic engine. */
-        if (strcmp(id, "dynamic"))
-                {
-                if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
+        if (strcmp(id, "dynamic")) {
+                if ((load_dir = getenv("OPENSSL_ENGINES")) == 0)
+                        load_dir = ENGINESDIR;
                 iterator = ENGINE_by_id("dynamic");
-                if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
-                                !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
-                                !ENGINE_ctrl_cmd_string(iterator, "DIR_ADD",
-                                        load_dir, 0) ||
-                                !ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) ||
-                                !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
-                                goto notfound;
+                if (!iterator ||
+                    !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
+                    !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
+                    !ENGINE_ctrl_cmd_string(iterator, "DIR_ADD", load_dir, 0) ||
+                    !ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) ||
+                    !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
+                        goto notfound;
                 return iterator;
-                }
+        }
+
 notfound:
         ENGINE_free(iterator);
-        ENGINEerr(ENGINE_F_ENGINE_BY_ID,ENGINE_R_NO_SUCH_ENGINE);
+        ENGINEerr(ENGINE_F_ENGINE_BY_ID, ENGINE_R_NO_SUCH_ENGINE);
         ERR_asprintf_error_data("id=%s", id);
         return NULL;
         /* EEK! Experimental code ends */
 #endif
-        }
+}
 
-int ENGINE_up_ref(ENGINE *e)
-        {
-        if (e == NULL)
-                {
-                ENGINEerr(ENGINE_F_ENGINE_UP_REF,ERR_R_PASSED_NULL_PARAMETER);
+int
+ENGINE_up_ref(ENGINE *e)
+{
+        if (e == NULL) {
+                ENGINEerr(ENGINE_F_ENGINE_UP_REF, ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
-                }
-        CRYPTO_add(&e->struct_ref,1,CRYPTO_LOCK_ENGINE);
-        return 1;
         }
+        CRYPTO_add(&e->struct_ref, 1, CRYPTO_LOCK_ENGINE);
+        return 1;
+}
diff --git a/src/lib/libssl/src/crypto/engine/engine.h b/src/lib/libssl/src/crypto/engine/engine.h
index 6dfd0ad6d1..24d2c5eac5 100644
--- a/src/lib/libssl/src/crypto/engine/engine.h
+++ b/src/lib/libssl/src/crypto/engine/engine.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.h,v 1.28 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: engine.h,v 1.29 2014/06/22 12:16:28 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,7 +57,7 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
@@ -140,7 +140,7 @@ extern "C" {
  * the existing ENGINE's structural reference count. */
 #define ENGINE_FLAGS_BY_ID_COPY         (int)0x0004
 
-/* This flag if for an ENGINE that does not want its methods registered as 
+/* This flag if for an ENGINE that does not want its methods registered as
  * part of ENGINE_register_all_complete() for example if the methods are
  * not usable as default methods.
  */
@@ -254,26 +254,27 @@ extern "C" {
  * array). NB: The array must be ordered in increasing order of cmd_num.
  * "null-terminated" means that the last ENGINE_CMD_DEFN element has cmd_num set
  * to zero and/or cmd_name set to NULL. */
-typedef struct ENGINE_CMD_DEFN_st
-        {
+typedef struct ENGINE_CMD_DEFN_st {
         unsigned int cmd_num; /* The command number */
         const char *cmd_name; /* The command name itself */
         const char *cmd_desc; /* A short description of the command */
         unsigned int cmd_flags; /* The input the command expects */
-        } ENGINE_CMD_DEFN;
+} ENGINE_CMD_DEFN;
 
 /* Generic function pointer */
 typedef int (*ENGINE_GEN_FUNC_PTR)(void);
 /* Generic function pointer taking no arguments */
 typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
 /* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *, void (*f)(void));
+typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *,
+    void (*f)(void));
 /* Generic load_key function pointer */
 typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-        UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
-        STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,
-        STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);
+    STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,
+    STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);
+
 /* These callback types are for an ENGINE's handler for cipher and digest logic.
  * These handlers have these prototypes;
  *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
@@ -286,10 +287,14 @@ typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
  */
 /* Returns to a pointer to the array of supported cipher 'nid's. If the second
  * parameter is non-NULL it is set to the size of the returned array. */
-typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **, const int **, int);
+typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **,
+    const int **, int);
 typedef int (*ENGINE_DIGESTS_PTR)(ENGINE *, const EVP_MD **, const int **, int);
-typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **, const int **, int);
-typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **, const int **, int);
+typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **,
+    const int **, int);
+typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **,
+    const int **, int);
+
 /* STRUCTURE functions ... all of these functions deal with pointers to ENGINE
  * structures where the pointers have a "structural reference". This means that
  * their reference is to allowed access to the structure but it does not imply
@@ -405,7 +410,7 @@ int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
  * See the comment on ENGINE_ctrl_cmd_string() for an explanation on how to
  * use the cmd_name and cmd_optional. */
 int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-        long i, void *p, void (*f)(void), int cmd_optional);
+    long i, void *p, void (*f)(void), int cmd_optional);
 
 /* This function passes a command-name and argument to an ENGINE. The cmd_name
  * is converted to a command number and the control command is called using
@@ -427,7 +432,7 @@ int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
  * compliant ENGINE-based applications can work consistently with the same
  * configuration for the same ENGINE-enabled devices, across applications. */
 int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-                                int cmd_optional);
+    int cmd_optional);
 
 /* These functions are useful for manufacturing new ENGINE structures. They
  * don't address reference counting at all - one uses them to populate an ENGINE
@@ -454,7 +459,7 @@ int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
 int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f);
 int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
 int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-                                ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
+    ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
 int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
 int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
 int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
@@ -463,7 +468,7 @@ int ENGINE_set_flags(ENGINE *e, int flags);
 int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
 /* These functions allow control over any per-structure ENGINE data. */
 int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+    CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
 void *ENGINE_get_ex_data(const ENGINE *e, int idx);
 
@@ -502,9 +507,9 @@ const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
 const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
 const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
 const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-                                        const char *str, int len);
+    const char *str, int len);
 const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-                                        const char *str, int len);
+    const char *str, int len);
 const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
 int ENGINE_get_flags(const ENGINE *e);
 
@@ -533,13 +538,13 @@ int ENGINE_finish(ENGINE *e);
  * location, handled by the engine.  The storage may be on a card or
  * whatever. */
 EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
-        STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,
-        STACK_OF(X509) **pother,
-        UI_METHOD *ui_method, void *callback_data);
+    STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,
+    STACK_OF(X509) **pother,
+    UI_METHOD *ui_method, void *callback_data);
 
 /* This returns a pointer for the current ENGINE structure that
  * is (by default) performing any RSA operations. The value returned
@@ -614,24 +619,24 @@ typedef struct st_dynamic_MEM_fns {
         dyn_MEM_malloc_cb                       malloc_cb;
         dyn_MEM_realloc_cb                      realloc_cb;
         dyn_MEM_free_cb                         free_cb;
-        } dynamic_MEM_fns;
+} dynamic_MEM_fns;
 /* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use
  * these types so we (and any other dependant code) can simplify a bit?? */
-typedef void (*dyn_lock_locking_cb)(int,int,const char *,int);
-typedef int (*dyn_lock_add_lock_cb)(int*,int,int,const char *,int);
+typedef void (*dyn_lock_locking_cb)(int, int, const char *, int);
+typedef int (*dyn_lock_add_lock_cb)(int*, int, int, const char *, int);
 typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)(
-                                                const char *,int);
-typedef void (*dyn_dynlock_lock_cb)(int,struct CRYPTO_dynlock_value *,
-                                                const char *,int);
+    const char *, int);
+typedef void (*dyn_dynlock_lock_cb)(int, struct CRYPTO_dynlock_value *,
+    const char *, int);
 typedef void (*dyn_dynlock_destroy_cb)(struct CRYPTO_dynlock_value *,
-                                                const char *,int);
+    const char *, int);
 typedef struct st_dynamic_LOCK_fns {
         dyn_lock_locking_cb                     lock_locking_cb;
         dyn_lock_add_lock_cb                    lock_add_lock_cb;
         dyn_dynlock_create_cb                   dynlock_create_cb;
         dyn_dynlock_lock_cb                     dynlock_lock_cb;
         dyn_dynlock_destroy_cb                  dynlock_destroy_cb;
-        } dynamic_LOCK_fns;
+} dynamic_LOCK_fns;
 /* The top-level structure */
 typedef struct st_dynamic_fns {
         void                                    *static_state;
@@ -639,7 +644,7 @@ typedef struct st_dynamic_fns {
         const CRYPTO_EX_DATA_IMPL               *ex_data_fns;
         dynamic_MEM_fns                         mem_fns;
         dynamic_LOCK_fns                        lock_fns;
-        } dynamic_fns;
+} dynamic_fns;
 
 /* The version checking function should be of this prototype. NB: The
  * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading code.
@@ -673,7 +678,7 @@ typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
  * and returns an int value (zero for failure). 'fn' should have prototype;
  *    [static] int fn(ENGINE *e, const char *id); */
 typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
-                                const dynamic_fns *fns);
+    const dynamic_fns *fns);
 #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
         extern \
         int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
@@ -704,7 +709,7 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
  * detect this is to have a function that returns a pointer to some static data
  * and let the loading application and loaded ENGINE compare their respective
  * values. */
-void *ENGINE_get_static_state(void);
+                                        void *ENGINE_get_static_state(void);
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes