Remove stale wpa_supplicant hacks.
aosp-master has been updated past the point that this is necessary. Sadly, all
the other hacks still are. I'll try to get things rolling so we can ditch the
others in time.
Change-Id: If7b3aad271141fb26108a53972d2d3273f956e8d
Reviewed-on: https://boringssl-review.googlesource.com/7751
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index 2f61001..1dea3c5 100644
--- a/include/openssl/bn.h
+++ b/include/openssl/bn.h
@@ -852,15 +852,6 @@
#define BN_FLG_CONSTTIME 0x04
-/* Android compatibility section.
- *
- * These functions are declared, temporarily, for Android because
- * wpa_supplicant will take a little time to sync with upstream. Outside of
- * Android they'll have no definition. */
-
-OPENSSL_EXPORT BIGNUM *get_rfc3526_prime_1536(BIGNUM *bn);
-
-
#if defined(__cplusplus)
} /* extern C */
#endif
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index d804a88..6ac7421 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -4266,8 +4266,6 @@
* wpa_supplicant will take a little time to sync with upstream. Outside of
* Android they'll have no definition. */
-#define SSL_F_SSL_SET_SESSION_TICKET_EXT doesnt_exist
-
OPENSSL_EXPORT int SSL_set_session_ticket_ext(SSL *s, void *ext_data,
int ext_len);
OPENSSL_EXPORT int SSL_set_session_secret_cb(SSL *s, void *cb, void *arg);
