From 2742a3c32118e7cfbf30b216747dd3a0a1954251 Mon Sep 17 00:00:00 2001 From: reyk <> Date: Thu, 5 Feb 2015 01:33:22 +0000 Subject: Declare the x509_(mem|file|dir)_lookup symbols as static because they shouldn't be used directly. They aren't part of the API; each module (file, dir, mem) provides an actual function to export the now-static object. OK miod@ --- src/lib/libcrypto/x509/by_dir.c | 4 ++-- src/lib/libcrypto/x509/by_file.c | 4 ++-- src/lib/libcrypto/x509/by_mem.c | 4 ++-- src/lib/libssl/src/crypto/x509/by_dir.c | 4 ++-- src/lib/libssl/src/crypto/x509/by_file.c | 4 ++-- src/lib/libssl/src/crypto/x509/by_mem.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c index 3ac6f11f07..46003cb320 100644 --- a/src/lib/libcrypto/x509/by_dir.c +++ b/src/lib/libcrypto/x509/by_dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_dir.c,v 1.34 2015/01/22 11:16:56 jsing Exp $ */ +/* $OpenBSD: by_dir.c,v 1.35 2015/02/05 01:33:22 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -101,7 +101,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type); static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, X509_OBJECT *ret); -X509_LOOKUP_METHOD x509_dir_lookup = { +static X509_LOOKUP_METHOD x509_dir_lookup = { .name = "Load certs from files in a directory", .new_item = new_dir, .free = free_dir, diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c index 111289e143..91a8e781b2 100644 --- a/src/lib/libcrypto/x509/by_file.c +++ b/src/lib/libcrypto/x509/by_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_file.c,v 1.17 2015/01/22 11:16:56 jsing Exp $ */ +/* $OpenBSD: by_file.c,v 1.18 2015/02/05 01:33:22 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -70,7 +70,7 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret); -X509_LOOKUP_METHOD x509_file_lookup = { +static X509_LOOKUP_METHOD x509_file_lookup = { .name = "Load file into cache", .new_item = NULL, .free = NULL, diff --git a/src/lib/libcrypto/x509/by_mem.c b/src/lib/libcrypto/x509/by_mem.c index c01c4d20be..ecab813406 100644 --- a/src/lib/libcrypto/x509/by_mem.c +++ b/src/lib/libcrypto/x509/by_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_mem.c,v 1.2 2015/01/22 11:16:56 jsing Exp $ */ +/* $OpenBSD: by_mem.c,v 1.3 2015/02/05 01:33:22 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -70,7 +70,7 @@ static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **); -X509_LOOKUP_METHOD x509_mem_lookup = { +static X509_LOOKUP_METHOD x509_mem_lookup = { .name = "Load cert from memory", .new_item = NULL, .free = NULL, diff --git a/src/lib/libssl/src/crypto/x509/by_dir.c b/src/lib/libssl/src/crypto/x509/by_dir.c index 3ac6f11f07..46003cb320 100644 --- a/src/lib/libssl/src/crypto/x509/by_dir.c +++ b/src/lib/libssl/src/crypto/x509/by_dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_dir.c,v 1.34 2015/01/22 11:16:56 jsing Exp $ */ +/* $OpenBSD: by_dir.c,v 1.35 2015/02/05 01:33:22 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -101,7 +101,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type); static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, X509_OBJECT *ret); -X509_LOOKUP_METHOD x509_dir_lookup = { +static X509_LOOKUP_METHOD x509_dir_lookup = { .name = "Load certs from files in a directory", .new_item = new_dir, .free = free_dir, diff --git a/src/lib/libssl/src/crypto/x509/by_file.c b/src/lib/libssl/src/crypto/x509/by_file.c index 111289e143..91a8e781b2 100644 --- a/src/lib/libssl/src/crypto/x509/by_file.c +++ b/src/lib/libssl/src/crypto/x509/by_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_file.c,v 1.17 2015/01/22 11:16:56 jsing Exp $ */ +/* $OpenBSD: by_file.c,v 1.18 2015/02/05 01:33:22 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -70,7 +70,7 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret); -X509_LOOKUP_METHOD x509_file_lookup = { +static X509_LOOKUP_METHOD x509_file_lookup = { .name = "Load file into cache", .new_item = NULL, .free = NULL, diff --git a/src/lib/libssl/src/crypto/x509/by_mem.c b/src/lib/libssl/src/crypto/x509/by_mem.c index c01c4d20be..ecab813406 100644 --- a/src/lib/libssl/src/crypto/x509/by_mem.c +++ b/src/lib/libssl/src/crypto/x509/by_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_mem.c,v 1.2 2015/01/22 11:16:56 jsing Exp $ */ +/* $OpenBSD: by_mem.c,v 1.3 2015/02/05 01:33:22 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -70,7 +70,7 @@ static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **); -X509_LOOKUP_METHOD x509_mem_lookup = { +static X509_LOOKUP_METHOD x509_mem_lookup = { .name = "Load cert from memory", .new_item = NULL, .free = NULL, -- cgit v1.2.3-55-g6feb