kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove files from Trusty which can't link because of Trusty libc.

Browse Source 
Change-Id: If3d93648cf6561c02c208895526ae1f1cbfa2b51
Reviewed-on: https://boringssl-review.googlesource.com/27524
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Jesse Selover 2018-04-17 15:20:40 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 6f6a237d46
commit 35e7c994be
6 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/bio/connect.c
View File

@ -56,6 +56,8 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#if !defined(OPENSSL_TRUSTY)
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
@ -540,3 +542,5 @@ int BIO_set_nbio(BIO *bio, int on) {
int BIO_do_connect(BIO *bio) { int BIO_do_connect(BIO *bio) {
return BIO_ctrl(bio, BIO_C_DO_STATE_MACHINE, 0, NULL); return BIO_ctrl(bio, BIO_C_DO_STATE_MACHINE, 0, NULL);
} }
#endif // OPENSSL_TRUSTY

4
crypto/bio/fd.c
View File

@ -56,6 +56,8 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#if !defined(OPENSSL_TRUSTY)
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
@ -274,3 +276,5 @@ int BIO_set_fd(BIO *bio, int fd, int close_flag) {
int BIO_get_fd(BIO *bio, int *out_fd) { int BIO_get_fd(BIO *bio, int *out_fd) {
return BIO_ctrl(bio, BIO_C_GET_FD, 0, (char *) out_fd); return BIO_ctrl(bio, BIO_C_GET_FD, 0, (char *) out_fd);
} }
#endif // OPENSSL_TRUSTY

4
crypto/bio/file.c
View File

@ -73,6 +73,8 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#if !defined(OPENSSL_TRUSTY)
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -313,3 +315,5 @@ int BIO_rw_filename(BIO *bio, const char *filename) {
return BIO_ctrl(bio, BIO_C_SET_FILENAME, return BIO_ctrl(bio, BIO_C_SET_FILENAME,
BIO_CLOSE | BIO_FP_READ | BIO_FP_WRITE, (char *)filename); BIO_CLOSE | BIO_FP_READ | BIO_FP_WRITE, (char *)filename);
} }
#endif // OPENSSL_TRUSTY

4
crypto/bio/socket.c
View File

@ -57,6 +57,8 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#if !defined(OPENSSL_TRUSTY)
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
@ -200,3 +202,5 @@ BIO *BIO_new_socket(int fd, int close_flag) {
BIO_set_fd(ret, fd, close_flag); BIO_set_fd(ret, fd, close_flag);
return ret; return ret;
} }
#endif // OPENSSL_TRUSTY

4
crypto/bio/socket_helper.c
View File

@ -18,6 +18,8 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/err.h> #include <openssl/err.h>
#if !defined(OPENSSL_TRUSTY)
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
@ -112,3 +114,5 @@ int bio_sock_error(int sock) {
} }
return error; return error;
} }
#endif // OPENSSL_TRUSTY

4
crypto/x509/by_dir.c
View File

@ -65,6 +65,8 @@
#include <openssl/thread.h> #include <openssl/thread.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#if !defined(OPENSSL_TRUSTY)
#include "../internal.h" #include "../internal.h"
typedef struct lookup_dir_hashes_st { typedef struct lookup_dir_hashes_st {
@ -452,3 +454,5 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
BUF_MEM_free(b); BUF_MEM_free(b);
return (ok); return (ok);
} }
#endif // OPENSSL_TRUSTY