summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/a_dup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/a_dup.c')
-rw-r--r--src/lib/libcrypto/asn1/a_dup.c54
1 files changed, 28 insertions, 26 deletions
diff --git a/src/lib/libcrypto/asn1/a_dup.c b/src/lib/libcrypto/asn1/a_dup.c
index 409bdcf2d1..5f5c4951ea 100644
--- a/src/lib/libcrypto/asn1/a_dup.c
+++ b/src/lib/libcrypto/asn1/a_dup.c
@@ -5,21 +5,21 @@
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA, 11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms 13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 * 15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in 16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed. 17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution 18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used. 19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or 20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package. 21 * in documentation (online or textual) provided with the package.
22 * 22 *
23 * Redistribution and use in source and binary forms, with or without 23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions 24 * modification, are permitted provided that the following conditions
25 * are met: 25 * are met:
@@ -34,10 +34,10 @@
34 * Eric Young (eay@cryptsoft.com)" 34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library 35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-). 36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from 37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement: 38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 * 40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE. 51 * SUCH DAMAGE.
52 * 52 *
53 * The licence and distribution terms for any publically available version or 53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be 54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence 55 * copied and put under another distribution licence
@@ -62,28 +62,29 @@
62 62
63#ifndef NO_OLD_ASN1 63#ifndef NO_OLD_ASN1
64 64
65void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) 65void *
66ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x)
66{ 67{
67 unsigned char *b,*p; 68 unsigned char *b, *p;
68 const unsigned char *p2; 69 const unsigned char *p2;
69 int i; 70 int i;
70 char *ret; 71 char *ret;
71 72
72 if (x == NULL) 73 if (x == NULL)
73 return(NULL); 74 return (NULL);
74 75
75 i=i2d(x,NULL); 76 i = i2d(x, NULL);
76 b=malloc(i+10); 77 b = malloc(i + 10);
77 if (b == NULL) { 78 if (b == NULL) {
78 ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); 79 ASN1err(ASN1_F_ASN1_DUP, ERR_R_MALLOC_FAILURE);
79 return(NULL); 80 return (NULL);
80 } 81 }
81 p= b; 82 p = b;
82 i=i2d(x,&p); 83 i = i2d(x, &p);
83 p2= b; 84 p2 = b;
84 ret=d2i(NULL,&p2,i); 85 ret = d2i(NULL, &p2, i);
85 free(b); 86 free(b);
86 return(ret); 87 return (ret);
87} 88}
88 89
89#endif 90#endif
@@ -93,7 +94,8 @@ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x)
93 * the underlying structure instead of doing and encode and decode. 94 * the underlying structure instead of doing and encode and decode.
94 */ 95 */
95 96
96void *ASN1_item_dup(const ASN1_ITEM *it, void *x) 97void *
98ASN1_item_dup(const ASN1_ITEM *it, void *x)
97{ 99{
98 unsigned char *b = NULL; 100 unsigned char *b = NULL;
99 const unsigned char *p; 101 const unsigned char *p;
@@ -101,15 +103,15 @@ void *ASN1_item_dup(const ASN1_ITEM *it, void *x)
101 void *ret; 103 void *ret;
102 104
103 if (x == NULL) 105 if (x == NULL)
104 return(NULL); 106 return (NULL);
105 107
106 i=ASN1_item_i2d(x,&b,it); 108 i = ASN1_item_i2d(x, &b, it);
107 if (b == NULL) { 109 if (b == NULL) {
108 ASN1err(ASN1_F_ASN1_ITEM_DUP,ERR_R_MALLOC_FAILURE); 110 ASN1err(ASN1_F_ASN1_ITEM_DUP, ERR_R_MALLOC_FAILURE);
109 return(NULL); 111 return (NULL);
110 } 112 }
111 p= b; 113 p = b;
112 ret=ASN1_item_d2i(NULL,&p,i, it); 114 ret = ASN1_item_d2i(NULL, &p, i, it);
113 free(b); 115 free(b);
114 return(ret); 116 return (ret);
115} 117}