Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6-0]: src/crypto/external/bsd/openssl/dist Apply patch (requested...
details: https://anonhg.NetBSD.org/src/rev/be01d4bc99ec
branches: netbsd-6-0
changeset: 775232:be01d4bc99ec
user: snj <snj%NetBSD.org@localhost>
date: Fri Aug 18 05:32:55 2017 +0000
description:
Apply patch (requested by mrg in ticket #1497):
rename free_func to freefunc, following -current, to avoid namespace
clashes with zlib.h.
diffstat:
crypto/external/bsd/openssl/dist/crypto/asn1/a_set.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/asn1/asn1.h | 4 +-
crypto/external/bsd/openssl/dist/crypto/asn1/asn1_mac.h | 64 +-
crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bio/bio.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/crypto.h | 4 +-
crypto/external/bsd/openssl/dist/crypto/dh/dh.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/dh/dh_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/dsa/dsa.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/dsa/dsa_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec.h | 6 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_key.c | 12 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h | 10 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c | 24 +-
crypto/external/bsd/openssl/dist/crypto/ecdh/ecdh.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/ecdh/ech_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/ecdsa/ecdsa.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/ecdsa/ecs_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/engine/engine.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/ex_data.c | 20 +-
crypto/external/bsd/openssl/dist/crypto/mem.c | 16 +-
crypto/external/bsd/openssl/dist/crypto/objects/o_names.c | 14 +-
crypto/external/bsd/openssl/dist/crypto/objects/objects.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/stack/safestack.h | 404 +++++++-------
crypto/external/bsd/openssl/dist/crypto/store/store.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/store/str_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/ui/ui.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/ui/ui_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509.h | 2 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h | 2 +-
crypto/external/bsd/openssl/dist/ssl/ssl.h | 6 +-
crypto/external/bsd/openssl/dist/ssl/ssl_lib.c | 8 +-
crypto/external/bsd/openssl/dist/ssl/ssl_sess.c | 4 +-
40 files changed, 338 insertions(+), 338 deletions(-)
diffs (truncated from 2246 to 300 lines):
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/asn1/a_set.c
--- a/crypto/external/bsd/openssl/dist/crypto/asn1/a_set.c Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/asn1/a_set.c Fri Aug 18 05:32:55 2017 +0000
@@ -169,7 +169,7 @@
STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
const unsigned char **pp,
long length, d2i_of_void *d2i,
- void (*free_func) (OPENSSL_BLOCK),
+ void (*freefunc) (OPENSSL_BLOCK),
int ex_tag, int ex_class)
{
ASN1_const_CTX c;
@@ -232,8 +232,8 @@
return (ret);
err:
if ((ret != NULL) && ((a == NULL) || (*a != ret))) {
- if (free_func != NULL)
- sk_OPENSSL_BLOCK_pop_free(ret, free_func);
+ if (freefunc != NULL)
+ sk_OPENSSL_BLOCK_pop_free(ret, freefunc);
else
sk_OPENSSL_BLOCK_free(ret);
}
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/asn1/asn1.h
--- a/crypto/external/bsd/openssl/dist/crypto/asn1/asn1.h Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/asn1/asn1.h Fri Aug 18 05:32:55 2017 +0000
@@ -904,7 +904,7 @@
STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
const unsigned char **pp,
long length, d2i_of_void *d2i,
- void (*free_func) (OPENSSL_BLOCK),
+ void (*freefunc) (OPENSSL_BLOCK),
int ex_tag, int ex_class);
# ifndef OPENSSL_NO_BIO
@@ -1058,7 +1058,7 @@
STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
d2i_of_void *d2i,
- void (*free_func) (OPENSSL_BLOCK));
+ void (*freefunc) (OPENSSL_BLOCK));
unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
unsigned char **buf, int *len);
void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/asn1/asn1_mac.h
--- a/crypto/external/bsd/openssl/dist/crypto/asn1/asn1_mac.h Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/asn1/asn1_mac.h Fri Aug 18 05:32:55 2017 +0000
@@ -176,23 +176,23 @@
M_ASN1_D2I_get_imp(b,func, type);\
}
-# define M_ASN1_D2I_get_set(r,func,free_func) \
- M_ASN1_D2I_get_imp_set(r,func,free_func, \
+# define M_ASN1_D2I_get_set(r,func,freefunc) \
+ M_ASN1_D2I_get_imp_set(r,func,freefunc, \
V_ASN1_SET,V_ASN1_UNIVERSAL);
-# define M_ASN1_D2I_get_set_type(type,r,func,free_func) \
- M_ASN1_D2I_get_imp_set_type(type,r,func,free_func, \
+# define M_ASN1_D2I_get_set_type(type,r,func,freefunc) \
+ M_ASN1_D2I_get_imp_set_type(type,r,func,freefunc, \
V_ASN1_SET,V_ASN1_UNIVERSAL);
-# define M_ASN1_D2I_get_set_opt(r,func,free_func) \
+# define M_ASN1_D2I_get_set_opt(r,func,freefunc) \
if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
- { M_ASN1_D2I_get_set(r,func,free_func); }
+ { M_ASN1_D2I_get_set(r,func,freefunc); }
-# define M_ASN1_D2I_get_set_opt_type(type,r,func,free_func) \
+# define M_ASN1_D2I_get_set_opt_type(type,r,func,freefunc) \
if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
- { M_ASN1_D2I_get_set_type(type,r,func,free_func); }
+ { M_ASN1_D2I_get_set_type(type,r,func,freefunc); }
# define M_ASN1_I2D_len_SET_opt(a,f) \
if ((a != NULL) && (sk_num(a) != 0)) \
@@ -210,61 +210,61 @@
if ((a != NULL) && (sk_##type##_num(a) != 0)) \
M_ASN1_I2D_put_SEQUENCE_type(type,a,f);
-# define M_ASN1_D2I_get_IMP_set_opt(b,func,free_func,tag) \
+# define M_ASN1_D2I_get_IMP_set_opt(b,func,freefunc,tag) \
if ((c.slen != 0) && \
(M_ASN1_next == \
(V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
{ \
- M_ASN1_D2I_get_imp_set(b,func,free_func,\
+ M_ASN1_D2I_get_imp_set(b,func,freefunc,\
tag,V_ASN1_CONTEXT_SPECIFIC); \
}
-# define M_ASN1_D2I_get_IMP_set_opt_type(type,b,func,free_func,tag) \
+# define M_ASN1_D2I_get_IMP_set_opt_type(type,b,func,freefunc,tag) \
if ((c.slen != 0) && \
(M_ASN1_next == \
(V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
{ \
- M_ASN1_D2I_get_imp_set_type(type,b,func,free_func,\
+ M_ASN1_D2I_get_imp_set_type(type,b,func,freefunc,\
tag,V_ASN1_CONTEXT_SPECIFIC); \
}
-# define M_ASN1_D2I_get_seq(r,func,free_func) \
- M_ASN1_D2I_get_imp_set(r,func,free_func,\
+# define M_ASN1_D2I_get_seq(r,func,freefunc) \
+ M_ASN1_D2I_get_imp_set(r,func,freefunc,\
V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-# define M_ASN1_D2I_get_seq_type(type,r,func,free_func) \
- M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
+# define M_ASN1_D2I_get_seq_type(type,r,func,freefunc) \
+ M_ASN1_D2I_get_imp_set_type(type,r,func,freefunc,\
V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-# define M_ASN1_D2I_get_seq_opt(r,func,free_func) \
+# define M_ASN1_D2I_get_seq_opt(r,func,freefunc) \
if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
- { M_ASN1_D2I_get_seq(r,func,free_func); }
+ { M_ASN1_D2I_get_seq(r,func,freefunc); }
-# define M_ASN1_D2I_get_seq_opt_type(type,r,func,free_func) \
+# define M_ASN1_D2I_get_seq_opt_type(type,r,func,freefunc) \
if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
- { M_ASN1_D2I_get_seq_type(type,r,func,free_func); }
+ { M_ASN1_D2I_get_seq_type(type,r,func,freefunc); }
-# define M_ASN1_D2I_get_IMP_set(r,func,free_func,x) \
- M_ASN1_D2I_get_imp_set(r,func,free_func,\
+# define M_ASN1_D2I_get_IMP_set(r,func,freefunc,x) \
+ M_ASN1_D2I_get_imp_set(r,func,freefunc,\
x,V_ASN1_CONTEXT_SPECIFIC);
-# define M_ASN1_D2I_get_IMP_set_type(type,r,func,free_func,x) \
- M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
+# define M_ASN1_D2I_get_IMP_set_type(type,r,func,freefunc,x) \
+ M_ASN1_D2I_get_imp_set_type(type,r,func,freefunc,\
x,V_ASN1_CONTEXT_SPECIFIC);
-# define M_ASN1_D2I_get_imp_set(r,func,free_func,a,b) \
+# define M_ASN1_D2I_get_imp_set(r,func,freefunc,a,b) \
c.q=c.p; \
if (d2i_ASN1_SET(&(r),&c.p,c.slen,(char *(*)())func,\
- (void (*)())free_func,a,b) == NULL) \
+ (void (*)())freefunc,a,b) == NULL) \
{ c.line=__LINE__; goto err; } \
c.slen-=(c.p-c.q);
-# define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \
+# define M_ASN1_D2I_get_imp_set_type(type,r,func,freefunc,a,b) \
c.q=c.p; \
if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\
- free_func,a,b) == NULL) \
+ freefunc,a,b) == NULL) \
{ c.line=__LINE__; goto err; } \
c.slen-=(c.p-c.q);
@@ -299,7 +299,7 @@
c.slen-=(c.p-c.q); \
}
-# define M_ASN1_D2I_get_EXP_set_opt(r,func,free_func,tag,b) \
+# define M_ASN1_D2I_get_EXP_set_opt(r,func,freefunc,tag,b) \
if ((c.slen != 0) && (M_ASN1_next == \
(V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
{ \
@@ -314,7 +314,7 @@
if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
Tlen = c.slen - (c.p - c.q) - 2; \
if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \
- (void (*)())free_func, \
+ (void (*)())freefunc, \
b,V_ASN1_UNIVERSAL) == NULL) \
{ c.line=__LINE__; goto err; } \
if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
@@ -326,7 +326,7 @@
c.slen-=(c.p-c.q); \
}
-# define M_ASN1_D2I_get_EXP_set_opt_type(type,r,func,free_func,tag,b) \
+# define M_ASN1_D2I_get_EXP_set_opt_type(type,r,func,freefunc,tag,b) \
if ((c.slen != 0) && (M_ASN1_next == \
(V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
{ \
@@ -341,7 +341,7 @@
if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
Tlen = c.slen - (c.p - c.q) - 2; \
if (d2i_ASN1_SET_OF_##type(&(r),&c.p,Tlen,func, \
- free_func,b,V_ASN1_UNIVERSAL) == NULL) \
+ freefunc,b,V_ASN1_UNIVERSAL) == NULL) \
{ c.line=__LINE__; goto err; } \
if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
Tlen = c.slen - (c.p - c.q); \
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c
--- a/crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c Fri Aug 18 05:32:55 2017 +0000
@@ -69,12 +69,12 @@
STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
d2i_of_void *d2i,
- void (*free_func) (OPENSSL_BLOCK))
+ void (*freefunc) (OPENSSL_BLOCK))
{
STACK_OF(OPENSSL_BLOCK) *sk;
const unsigned char *pbuf;
pbuf = buf;
- if (!(sk = d2i_ASN1_SET(NULL, &pbuf, len, d2i, free_func,
+ if (!(sk = d2i_ASN1_SET(NULL, &pbuf, len, d2i, freefunc,
V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL)))
ASN1err(ASN1_F_ASN1_SEQ_UNPACK, ASN1_R_DECODE_ERROR);
return sk;
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c
--- a/crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c Fri Aug 18 05:32:55 2017 +0000
@@ -145,10 +145,10 @@
IMPLEMENT_ASN1_DUP_FUNCTION(X509)
int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
- CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
+ CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *freefunc)
{
return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, argl, argp,
- new_func, dup_func, free_func);
+ new_func, dup_func, freefunc);
}
int X509_set_ex_data(X509 *r, int idx, void *arg)
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/bio/bio.h
--- a/crypto/external/bsd/openssl/dist/crypto/bio/bio.h Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/bio/bio.h Fri Aug 18 05:32:55 2017 +0000
@@ -635,7 +635,7 @@
int BIO_set_ex_data(BIO *bio, int idx, void *data);
void *BIO_get_ex_data(BIO *bio, int idx);
int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
- CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+ CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *freefunc);
unsigned long BIO_number_read(BIO *bio);
unsigned long BIO_number_written(BIO *bio);
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c
--- a/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c Fri Aug 18 05:32:55 2017 +0000
@@ -563,10 +563,10 @@
}
int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
- CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
+ CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *freefunc)
{
return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_BIO, argl, argp,
- new_func, dup_func, free_func);
+ new_func, dup_func, freefunc);
}
int BIO_set_ex_data(BIO *bio, int idx, void *data)
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c
--- a/crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c Fri Aug 18 05:32:55 2017 +0000
@@ -320,7 +320,7 @@
return Z_BUF_ERROR;
stream.zalloc = (alloc_func) 0;
- stream.zfree = (free_func) 0;
+ stream.zfree = (freefunc) 0;
err = inflateInit_(&stream, ZLIB_VERSION, sizeof(z_stream));
if (err != Z_OK)
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/crypto.h
--- a/crypto/external/bsd/openssl/dist/crypto/crypto.h Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/crypto.h Fri Aug 18 05:32:55 2017 +0000
@@ -305,7 +305,7 @@
long argl; /* Arbitary long */
void *argp; /* Arbitary void * */
CRYPTO_EX_new *new_func;
- CRYPTO_EX_free *free_func;
+ CRYPTO_EX_free *freefunc;
CRYPTO_EX_dup *dup_func;
} CRYPTO_EX_DATA_FUNCS;
@@ -409,7 +409,7 @@
/* Within a given class, get/register a new index */
int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
- CRYPTO_EX_free *free_func);
+ CRYPTO_EX_free *freefunc);
/*
* Initialise/duplicate/free CRYPTO_EX_DATA variables corresponding to a
* given class (invokes whatever per-class callbacks are applicable)
diff -r fa80257e3df1 -r be01d4bc99ec crypto/external/bsd/openssl/dist/crypto/dh/dh.h
--- a/crypto/external/bsd/openssl/dist/crypto/dh/dh.h Thu Aug 17 09:40:03 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/dh/dh.h Fri Aug 18 05:32:55 2017 +0000
@@ -199,7 +199,7 @@
int DH_up_ref(DH *dh);
int DH_size(const DH *dh);
int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
- CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
Home |
Main Index |
Thread Index |
Old Index