diff options
Diffstat (limited to 'libcrypto/libcrypto')
12 files changed, 65 insertions, 11 deletions
diff --git a/libcrypto/libcrypto/.gitattributes b/libcrypto/libcrypto/.gitattributes new file mode 100644 index 0000000..ff2ff6e --- /dev/null +++ b/libcrypto/libcrypto/.gitattributes @@ -0,0 +1,2 @@ +crypto symlink=dir +include symlink=dir diff --git a/libcrypto/libcrypto/buildfile b/libcrypto/libcrypto/buildfile index e431cb0..65cbe76 100644 --- a/libcrypto/libcrypto/buildfile +++ b/libcrypto/libcrypto/buildfile @@ -19,7 +19,6 @@ lib{crypto}: {h }{** -buildinf-body} \ -mdc2/** \ -poly1305/poly1305_ieee754 \ -poly1305/poly1305_base2_44} \ - {def }{libcrypto} \ crypto/{file}{LPdir_*.c des/ncbc_enc.c} \ $imp_libs @@ -36,7 +35,8 @@ linux = ($tclass == 'linux') bsd = ($tclass == 'bsd') windows = ($tclass == 'windows') -lib{crypto}: file{libcrypto.map}: include = ($linux || $bsd ? adhoc : false) +libs{crypto}: file{libcrypto.map}: include = ($linux || $bsd ? adhoc : false) +libs{crypto}: def{libcrypto}: include = $windows # Build options. # diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-linux.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-linux.h index 36f2daf..cf638d4 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-linux.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-linux.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from ../include/openssl/opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -105,6 +105,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h index 4fe7e1c..78d18d7 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from ../include/openssl/opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -111,6 +111,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h index 45442b7..548ae7e 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from ..\include\openssl\opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -111,6 +111,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h index 1243f27..97bc637 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from ../include/openssl/opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -108,6 +108,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-linux.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-linux.h index e215292..c7e272c 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-linux.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-linux.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from ../include/openssl/opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -105,6 +105,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h index 33d3468..05f8464 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from ../include/openssl/opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -111,6 +111,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h index fae3465..3f3e024 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by Makefile from ../include/openssl/opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -111,6 +111,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h index 4df6e6d..98a8571 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by makefile from ..\include\openssl\opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -111,6 +111,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >= 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif diff --git a/libcrypto/libcrypto/libcrypto.def b/libcrypto/libcrypto/libcrypto.def index a5c8b32..97c190c 100644 --- a/libcrypto/libcrypto/libcrypto.def +++ b/libcrypto/libcrypto/libcrypto.def @@ -1255,6 +1255,7 @@ EXPORTS EC_KEY_check_key EC_KEY_clear_flags EC_KEY_copy + EC_KEY_decoded_from_explicit_params EC_KEY_dup EC_KEY_free EC_KEY_generate_key @@ -3379,6 +3380,7 @@ EXPORTS X509V3_string_free X509_ALGORS_it X509_ALGOR_cmp + X509_ALGOR_copy X509_ALGOR_dup X509_ALGOR_free X509_ALGOR_get0 @@ -3611,6 +3613,8 @@ EXPORTS X509_REQ_print X509_REQ_print_ex X509_REQ_print_fp + X509_REQ_set0_signature + X509_REQ_set1_signature_algo X509_REQ_set_extension_nids X509_REQ_set_pubkey X509_REQ_set_subject_name diff --git a/libcrypto/libcrypto/libcrypto.map b/libcrypto/libcrypto/libcrypto.map index d273e85..0244caa 100644 --- a/libcrypto/libcrypto/libcrypto.map +++ b/libcrypto/libcrypto/libcrypto.map @@ -4459,7 +4459,15 @@ OPENSSL_1_1_1e { EVP_PKEY_meth_set_digestsign; EVP_PKEY_meth_set_digestverify; RSA_get0_pss_params; - local: *; } OPENSSL_1_1_1d; +OPENSSL_1_1_1h { + global: + EC_KEY_decoded_from_explicit_params; + X509_ALGOR_copy; + X509_REQ_set0_signature; + X509_REQ_set1_signature_algo; + local: *; +} OPENSSL_1_1_1e; + |