Merge pull request #4275 from mrezai/openssl-1.0.1s

Update OpenSSL to version 1.0.1s

1 files changed, 23 insertions, 18 deletions

diff --git a/drivers/builtin_openssl2/openssl/pqueue.h b/drivers/builtin_openssl2/openssl/pqueue.h
index 87fc9037c8..d40d9c7d85 100644
--- a/drivers/builtin_openssl2/openssl/pqueue.h
+++ b/drivers/builtin_openssl2/openssl/pqueue.h
@@ -1,7 +1,7 @@
 /* crypto/pqueue/pqueue.h */
-/* 
+/*
  * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
  */
 /* ====================================================================
  * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
@@ -11,7 +11,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
@@ -58,28 +58,30 @@
  */
 
 #ifndef HEADER_PQUEUE_H
-#define HEADER_PQUEUE_H
+# define HEADER_PQUEUE_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+# include <stdio.h>
+# include <stdlib.h>
+# include <string.h>
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
 typedef struct _pqueue *pqueue;
 
-typedef struct _pitem
-	{
-	unsigned char priority[8]; /* 64-bit value in big-endian encoding */
-	void *data;
-	struct _pitem *next;
-	} pitem;
+typedef struct _pitem {
+    unsigned char priority[8];  /* 64-bit value in big-endian encoding */
+    void *data;
+    struct _pitem *next;
+} pitem;
 
 typedef struct _pitem *piterator;
 
 pitem *pitem_new(unsigned char *prio64be, void *data);
-void   pitem_free(pitem *item);
+void pitem_free(pitem *item);
 
 pqueue pqueue_new(void);
-void   pqueue_free(pqueue pq);
+void pqueue_free(pqueue pq);
 
 pitem *pqueue_insert(pqueue pq, pitem *item);
 pitem *pqueue_peek(pqueue pq);
@@ -88,7 +90,10 @@ pitem *pqueue_find(pqueue pq, unsigned char *prio64be);
 pitem *pqueue_iterator(pqueue pq);
 pitem *pqueue_next(piterator *iter);
 
-void   pqueue_print(pqueue pq);
-int    pqueue_size(pqueue pq);
+void pqueue_print(pqueue pq);
+int pqueue_size(pqueue pq);
 
-#endif /* ! HEADER_PQUEUE_H */
+#ifdef  __cplusplus
+}
+#endif
+#endif                          /* ! HEADER_PQUEUE_H */