diff options
author | miod <> | 2015-02-14 15:21:49 +0000 |
---|---|---|
committer | miod <> | 2015-02-14 15:21:49 +0000 |
commit | 3831ec92614f93b5873fbec25f33aba2e8b7c2b5 (patch) | |
tree | ecef05fa7a97a3af7028f491f281b84b8a69ddd9 /src | |
parent | 7e1e1e77ce01ee4d256b26154c220a015fa615ae (diff) | |
download | openbsd-3831ec92614f93b5873fbec25f33aba2e8b7c2b5.tar.gz openbsd-3831ec92614f93b5873fbec25f33aba2e8b7c2b5.tar.bz2 openbsd-3831ec92614f93b5873fbec25f33aba2e8b7c2b5.zip |
Make asn1_ex_i2c() static. ok jsing@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/asn1/tasn_enc.c | 6 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/tasn_enc.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_enc.c b/src/lib/libcrypto/asn1/tasn_enc.c index f7209dc4eb..67d774a9c1 100644 --- a/src/lib/libcrypto/asn1/tasn_enc.c +++ b/src/lib/libcrypto/asn1/tasn_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tasn_enc.c,v 1.14 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: tasn_enc.c,v 1.15 2015/02/14 15:21:49 miod Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -71,6 +71,8 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out, | |||
71 | const ASN1_TEMPLATE *tt, int tag, int aclass); | 71 | const ASN1_TEMPLATE *tt, int tag, int aclass); |
72 | static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out, | 72 | static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out, |
73 | const ASN1_ITEM *it, int flags); | 73 | const ASN1_ITEM *it, int flags); |
74 | static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, | ||
75 | const ASN1_ITEM *it); | ||
74 | 76 | ||
75 | /* Top level i2d equivalents: the 'ndef' variant instructs the encoder | 77 | /* Top level i2d equivalents: the 'ndef' variant instructs the encoder |
76 | * to use indefinite length constructed encoding, where appropriate | 78 | * to use indefinite length constructed encoding, where appropriate |
@@ -543,7 +545,7 @@ asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out, | |||
543 | 545 | ||
544 | /* Produce content octets from a structure */ | 546 | /* Produce content octets from a structure */ |
545 | 547 | ||
546 | int | 548 | static int |
547 | asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, | 549 | asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, |
548 | const ASN1_ITEM *it) | 550 | const ASN1_ITEM *it) |
549 | { | 551 | { |
diff --git a/src/lib/libssl/src/crypto/asn1/tasn_enc.c b/src/lib/libssl/src/crypto/asn1/tasn_enc.c index f7209dc4eb..67d774a9c1 100644 --- a/src/lib/libssl/src/crypto/asn1/tasn_enc.c +++ b/src/lib/libssl/src/crypto/asn1/tasn_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tasn_enc.c,v 1.14 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: tasn_enc.c,v 1.15 2015/02/14 15:21:49 miod Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -71,6 +71,8 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out, | |||
71 | const ASN1_TEMPLATE *tt, int tag, int aclass); | 71 | const ASN1_TEMPLATE *tt, int tag, int aclass); |
72 | static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out, | 72 | static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out, |
73 | const ASN1_ITEM *it, int flags); | 73 | const ASN1_ITEM *it, int flags); |
74 | static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, | ||
75 | const ASN1_ITEM *it); | ||
74 | 76 | ||
75 | /* Top level i2d equivalents: the 'ndef' variant instructs the encoder | 77 | /* Top level i2d equivalents: the 'ndef' variant instructs the encoder |
76 | * to use indefinite length constructed encoding, where appropriate | 78 | * to use indefinite length constructed encoding, where appropriate |
@@ -543,7 +545,7 @@ asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out, | |||
543 | 545 | ||
544 | /* Produce content octets from a structure */ | 546 | /* Produce content octets from a structure */ |
545 | 547 | ||
546 | int | 548 | static int |
547 | asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, | 549 | asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, |
548 | const ASN1_ITEM *it) | 550 | const ASN1_ITEM *it) |
549 | { | 551 | { |