summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormiod <>2015-02-14 19:41:39 +0000
committermiod <>2015-02-14 19:41:39 +0000
commit5a3e51e157772c731e22d20f8f7394f5d0572b66 (patch)
tree1e1229593d897d7fff2d7b64a902c9fc8bdd883a /src
parentd04666e4754ff03d3f4e171f4da24871894aa15a (diff)
downloadopenbsd-5a3e51e157772c731e22d20f8f7394f5d0572b66.tar.gz
openbsd-5a3e51e157772c731e22d20f8f7394f5d0572b66.tar.bz2
openbsd-5a3e51e157772c731e22d20f8f7394f5d0572b66.zip
Remove asn1_ex_i2c() prototype, now that this function has been made static;
reminded by bcook@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/asn1t.h3
-rw-r--r--src/lib/libssl/src/crypto/asn1/asn1t.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/asn1t.h b/src/lib/libcrypto/asn1/asn1t.h
index 3d6874d874..578e140efa 100644
--- a/src/lib/libcrypto/asn1/asn1t.h
+++ b/src/lib/libcrypto/asn1/asn1t.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1t.h,v 1.11 2015/02/14 15:23:57 miod Exp $ */ 1/* $OpenBSD: asn1t.h,v 1.12 2015/02/14 19:41:39 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 */
@@ -855,7 +855,6 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it
855int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLATE *tt); 855int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLATE *tt);
856void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it); 856void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
857 857
858int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it);
859int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it); 858int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it);
860 859
861int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it); 860int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
diff --git a/src/lib/libssl/src/crypto/asn1/asn1t.h b/src/lib/libssl/src/crypto/asn1/asn1t.h
index 3d6874d874..578e140efa 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1t.h
+++ b/src/lib/libssl/src/crypto/asn1/asn1t.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1t.h,v 1.11 2015/02/14 15:23:57 miod Exp $ */ 1/* $OpenBSD: asn1t.h,v 1.12 2015/02/14 19:41:39 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 */
@@ -855,7 +855,6 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it
855int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLATE *tt); 855int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLATE *tt);
856void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it); 856void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
857 857
858int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it);
859int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it); 858int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it);
860 859
861int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it); 860int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);