summaryrefslogtreecommitdiffstats
path: root/crypto/opensslconf.h
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-03-15 16:03:43 -0700
committerBrian Carlstrom <bdc@google.com>2012-03-21 11:09:32 -0700
commit392aa7cc7d2b122614c5393c3e357da07fd07af3 (patch)
tree69f0b217fb624fdc56abb9f659c9bdea1b1865aa /crypto/opensslconf.h
parent7f1d63479ce92a2a4a0874b007e49f8acb13a0d9 (diff)
downloadreplicant_openssl-392aa7cc7d2b122614c5393c3e357da07fd07af3.zip
replicant_openssl-392aa7cc7d2b122614c5393c3e357da07fd07af3.tar.gz
replicant_openssl-392aa7cc7d2b122614c5393c3e357da07fd07af3.tar.bz2
openssl-1.0.1 upgrade
Bug: 6168278 Change-Id: I648f9172828120df5d19a14425e9ceec92647921
Diffstat (limited to 'crypto/opensslconf.h')
-rw-r--r--crypto/opensslconf.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/crypto/opensslconf.h b/crypto/opensslconf.h
index 26ac6ba..f17eaa9 100644
--- a/crypto/opensslconf.h
+++ b/crypto/opensslconf.h
@@ -8,6 +8,9 @@
#ifndef OPENSSL_NO_CAST
# define OPENSSL_NO_CAST
#endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
@@ -29,6 +32,9 @@
#ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779
#endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
#ifndef OPENSSL_NO_SEED
# define OPENSSL_NO_SEED
#endif
@@ -59,6 +65,9 @@
# if defined(OPENSSL_NO_CAST) && !defined(NO_CAST)
# define NO_CAST
# endif
+# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
+# define NO_EC_NISTP_64_GCC_128
+# endif
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
@@ -80,6 +89,9 @@
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779
# endif
+# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
+# define NO_SCTP
+# endif
# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
# define NO_SEED
# endif