Merge 6db22dc into b9690ab

pyca · Jan 24, 2015 · def269b · def269b
2 parents b9690ab + 6db22dc
commit def269b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/cryptography/hazmat/bindings/openssl/rand.py b/src/cryptography/hazmat/bindings/openssl/rand.py
@@ -6,6 +6,7 @@
 
 INCLUDES = """
 #include <openssl/rand.h>
+#include <openssl/opensslv.h>
 """
 
 TYPES = """
@@ -31,6 +32,11 @@
 """
 
 CUSTOMIZATIONS = """
+#if !defined(LIBRESSL_VERSION_NUMBER)
+int RAND_egd(const char *);
+int RAND_egd_bytes(const char *, int);
+int RAND_query_egd_bytes(const char *, unsigned char *, int);
+#endif
 """
 
 CONDITIONAL_NAMES = {}
diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py
@@ -524,7 +524,7 @@
 #endif
 
 /* ALPN was added in OpenSSL 1.0.2. */
-#if OPENSSL_VERSION_NUMBER < 0x10002001L
+#if OPENSSL_VERSION_NUMBER < 0x10002001L && !defined (LIBRESSL_VERSION_NUMBER)
 int (*SSL_CTX_set_alpn_protos)(SSL_CTX *,
                                const unsigned char *,
                                unsigned) = NULL;