diff options
| author | jsing <> | 2016-12-21 15:49:29 +0000 |
|---|---|---|
| committer | jsing <> | 2016-12-21 15:49:29 +0000 |
| commit | b0083b858b1b84b8b19bc553faa582079dda96ae (patch) | |
| tree | dc6bf9e697be4171031836e4b004f8c6c396b66c /src/lib/libcrypto/gost | |
| parent | 2bf82d6a2f5736c3b836867840e3ec84075634ca (diff) | |
| download | openbsd-b0083b858b1b84b8b19bc553faa582079dda96ae.tar.gz openbsd-b0083b858b1b84b8b19bc553faa582079dda96ae.tar.bz2 openbsd-b0083b858b1b84b8b19bc553faa582079dda96ae.zip | |
Explicitly export a list of symbols from libcrypto.
Move the "internal" BN functions from bn.h to bn_lcl.h and stop exporting
the bn_* symbols. These are documented as only being intended for internal
use, so why they were placed in a public header is beyond me...
This hides 363 previously exported symbols, most of which exist in headers
that are not installed and were never intended to be public. This also
removes a few crusty old things that should have died long ago (like
_ossl_old_des_read_pw). But don't worry... there are still 3451 symbols
exported from the library.
With input and testing from inoguchi@.
ok beck@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/gost')
| -rw-r--r-- | src/lib/libcrypto/gost/gost_asn1.h | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/gost/gost_locl.h | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libcrypto/gost/gost_asn1.h b/src/lib/libcrypto/gost/gost_asn1.h index 8cafa6be3b..7cabfc79c9 100644 --- a/src/lib/libcrypto/gost/gost_asn1.h +++ b/src/lib/libcrypto/gost/gost_asn1.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: gost_asn1.h,v 1.2 2016/09/04 17:02:31 jsing Exp $ */ | 1 | /* $OpenBSD: gost_asn1.h,v 1.3 2016/12/21 15:49:29 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 3 | * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| 4 | * Copyright (c) 2005-2006 Cryptocom LTD | 4 | * Copyright (c) 2005-2006 Cryptocom LTD |
| @@ -54,6 +54,8 @@ | |||
| 54 | 54 | ||
| 55 | #include <openssl/asn1.h> | 55 | #include <openssl/asn1.h> |
| 56 | 56 | ||
| 57 | __BEGIN_HIDDEN_DECLS | ||
| 58 | |||
| 57 | typedef struct { | 59 | typedef struct { |
| 58 | ASN1_OCTET_STRING *encrypted_key; | 60 | ASN1_OCTET_STRING *encrypted_key; |
| 59 | ASN1_OCTET_STRING *imit; | 61 | ASN1_OCTET_STRING *imit; |
| @@ -100,4 +102,6 @@ GOST_KEY_PARAMS *d2i_GOST_KEY_PARAMS(GOST_KEY_PARAMS **a, const unsigned char ** | |||
| 100 | int i2d_GOST_KEY_PARAMS(GOST_KEY_PARAMS *a, unsigned char **out); | 102 | int i2d_GOST_KEY_PARAMS(GOST_KEY_PARAMS *a, unsigned char **out); |
| 101 | extern const ASN1_ITEM GOST_KEY_PARAMS_it; | 103 | extern const ASN1_ITEM GOST_KEY_PARAMS_it; |
| 102 | 104 | ||
| 105 | __END_HIDDEN_DECLS | ||
| 106 | |||
| 103 | #endif | 107 | #endif |
diff --git a/src/lib/libcrypto/gost/gost_locl.h b/src/lib/libcrypto/gost/gost_locl.h index 9036f59771..b2e2c1362a 100644 --- a/src/lib/libcrypto/gost/gost_locl.h +++ b/src/lib/libcrypto/gost/gost_locl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: gost_locl.h,v 1.3 2014/11/13 20:29:55 miod Exp $ */ | 1 | /* $OpenBSD: gost_locl.h,v 1.4 2016/12/21 15:49:29 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 3 | * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| 4 | * Copyright (c) 2005-2006 Cryptocom LTD | 4 | * Copyright (c) 2005-2006 Cryptocom LTD |
| @@ -55,6 +55,8 @@ | |||
| 55 | #include <openssl/ec.h> | 55 | #include <openssl/ec.h> |
| 56 | #include <openssl/ecdsa.h> | 56 | #include <openssl/ecdsa.h> |
| 57 | 57 | ||
| 58 | __BEGIN_HIDDEN_DECLS | ||
| 59 | |||
| 58 | /* Internal representation of GOST substitution blocks */ | 60 | /* Internal representation of GOST substitution blocks */ |
| 59 | typedef struct { | 61 | typedef struct { |
| 60 | unsigned char k8[16]; | 62 | unsigned char k8[16]; |
| @@ -110,4 +112,6 @@ extern int GostR3410_get_pk_digest(int nid); | |||
| 110 | extern int GostR3410_256_param_id(const char *value); | 112 | extern int GostR3410_256_param_id(const char *value); |
| 111 | extern int GostR3410_512_param_id(const char *value); | 113 | extern int GostR3410_512_param_id(const char *value); |
| 112 | 114 | ||
| 115 | __END_HIDDEN_DECLS | ||
| 116 | |||
| 113 | #endif | 117 | #endif |
