From 8f579af4135b3f46a1521ffcfc81e802cc412443 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Tue, 22 Oct 2019 11:11:32 -0400 Subject: [PATCH] Revert "Handle symbol changes between openssl-1.0 and 1.1" This reverts commit 822938d9ae2f9461c515fb03e4699cb9b67ad8a7. --- racket/collects/openssl/mzssl.rkt | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/racket/collects/openssl/mzssl.rkt b/racket/collects/openssl/mzssl.rkt index 6bf45d6584..083956034d 100644 --- a/racket/collects/openssl/mzssl.rkt +++ b/racket/collects/openssl/mzssl.rkt @@ -349,21 +349,10 @@ TO DO: (define-crypto X509_NAME_get_entry (_fun _X509_NAME* _int -> _X509_NAME_ENTRY*/null)) (define-crypto X509_NAME_ENTRY_get_data (_fun _X509_NAME_ENTRY* -> _ASN1_STRING*)) (define-crypto X509_get_ext_d2i (_fun _X509* _int _pointer _pointer -> _STACK*/null)) -(define sk_num - (or (get-ffi-obj 'sk_num libcrypto (_fun _STACK* -> _int) - (lambda () #f)) - (get-ffi-obj 'OPENSSL_sk_num libcrypto (_fun _STACK* -> _int) - (make-not-available 'sk_num)))) -(define sk_GENERAL_NAME_value - (or (get-ffi-obj 'sk_value libcrypto (_fun _STACK* _int -> _GENERAL_NAME-pointer) - (lambda () #f)) - (get-ffi-obj 'OPENSSL_sk_value libcrypto (_fun _STACK* _int -> _GENERAL_NAME-pointer) - (make-not-available "sk_GENERAL_NAME_value")))) -(define sk_pop_free - (or (get-ffi-obj 'sk_pop_free libcrypto (_fun _STACK* _fpointer -> _void) - (lambda () #f)) - (get-ffi-obj 'OPENSSL_sk_pop_free libcrypto (_fun _STACK* _fpointer -> _void) - (make-not-available "sk_pop_free")))) +(define-crypto sk_num (_fun _STACK* -> _int)) +(define-crypto sk_GENERAL_NAME_value (_fun _STACK* _int -> _GENERAL_NAME-pointer) + #:c-id sk_value) +(define-crypto sk_pop_free (_fun _STACK* _fpointer -> _void)) ;; (define-crypto X509_get_default_cert_area (_fun -> _string)) (define-crypto X509_get_default_cert_dir (_fun -> _string))