diff options
author | markus <> | 2002-09-03 09:21:21 +0000 |
---|---|---|
committer | markus <> | 2002-09-03 09:21:21 +0000 |
commit | 2a403cf17b91db1355403be2649b62a15f65d0b1 (patch) | |
tree | ccb7f731e62b49ca25d700356d1d89a66fce9fde /src/lib/libcrypto/pkcs12 | |
parent | 0417492a9cd47355e6322690a822134d099084b8 (diff) | |
download | openbsd-2a403cf17b91db1355403be2649b62a15f65d0b1.tar.gz openbsd-2a403cf17b91db1355403be2649b62a15f65d0b1.tar.bz2 openbsd-2a403cf17b91db1355403be2649b62a15f65d0b1.zip |
unused files, not part of OpenSSL 0.9.7
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_bags.c | 192 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_lib.c | 111 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_mac.c | 110 | ||||
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_sbag.c | 234 |
4 files changed, 0 insertions, 647 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_bags.c b/src/lib/libcrypto/pkcs12/p12_bags.c deleted file mode 100644 index 56547ef933..0000000000 --- a/src/lib/libcrypto/pkcs12/p12_bags.c +++ /dev/null | |||
@@ -1,192 +0,0 @@ | |||
1 | /* p12_bags.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * licensing@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/asn1_mac.h> | ||
62 | #include <openssl/pkcs12.h> | ||
63 | |||
64 | int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **pp) | ||
65 | { | ||
66 | int bagnid, v = 0; | ||
67 | M_ASN1_I2D_vars(a); | ||
68 | bagnid = OBJ_obj2nid (a->type); | ||
69 | M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT); | ||
70 | |||
71 | switch (bagnid) { | ||
72 | |||
73 | case NID_x509Certificate: | ||
74 | M_ASN1_I2D_len_EXP_opt (a->value.x509cert, | ||
75 | i2d_ASN1_OCTET_STRING, 0, v); | ||
76 | break; | ||
77 | |||
78 | case NID_x509Crl: | ||
79 | M_ASN1_I2D_len_EXP_opt (a->value.x509crl, | ||
80 | i2d_ASN1_OCTET_STRING, 0, v); | ||
81 | break; | ||
82 | |||
83 | case NID_sdsiCertificate: | ||
84 | M_ASN1_I2D_len_EXP_opt (a->value.sdsicert, | ||
85 | i2d_ASN1_IA5STRING, 0, v); | ||
86 | break; | ||
87 | |||
88 | default: | ||
89 | M_ASN1_I2D_len_EXP_opt (a->value.other, | ||
90 | i2d_ASN1_TYPE, 0, v); | ||
91 | break; | ||
92 | } | ||
93 | |||
94 | M_ASN1_I2D_seq_total (); | ||
95 | |||
96 | M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT); | ||
97 | |||
98 | switch (bagnid) { | ||
99 | |||
100 | case NID_x509Certificate: | ||
101 | M_ASN1_I2D_put_EXP_opt (a->value.x509cert, | ||
102 | i2d_ASN1_OCTET_STRING, 0, v); | ||
103 | break; | ||
104 | |||
105 | case NID_x509Crl: | ||
106 | M_ASN1_I2D_put_EXP_opt (a->value.x509crl, | ||
107 | i2d_ASN1_OCTET_STRING, 0, v); | ||
108 | break; | ||
109 | |||
110 | case NID_sdsiCertificate: | ||
111 | M_ASN1_I2D_put_EXP_opt (a->value.sdsicert, | ||
112 | i2d_ASN1_IA5STRING, 0, v); | ||
113 | break; | ||
114 | |||
115 | default: | ||
116 | M_ASN1_I2D_put_EXP_opt (a->value.other, i2d_ASN1_TYPE, 0, v); | ||
117 | break; | ||
118 | } | ||
119 | M_ASN1_I2D_finish(); | ||
120 | } | ||
121 | |||
122 | PKCS12_BAGS *PKCS12_BAGS_new(void) | ||
123 | { | ||
124 | PKCS12_BAGS *ret=NULL; | ||
125 | ASN1_CTX c; | ||
126 | M_ASN1_New_Malloc(ret, PKCS12_BAGS); | ||
127 | ret->type=NULL; | ||
128 | ret->value.other=NULL; | ||
129 | return (ret); | ||
130 | M_ASN1_New_Error(ASN1_F_PKCS12_BAGS_NEW); | ||
131 | } | ||
132 | |||
133 | PKCS12_BAGS *d2i_PKCS12_BAGS(PKCS12_BAGS **a, unsigned char **pp, | ||
134 | long length) | ||
135 | { | ||
136 | int bagnid; | ||
137 | M_ASN1_D2I_vars(a,PKCS12_BAGS *,PKCS12_BAGS_new); | ||
138 | M_ASN1_D2I_Init(); | ||
139 | M_ASN1_D2I_start_sequence(); | ||
140 | M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT); | ||
141 | bagnid = OBJ_obj2nid (ret->type); | ||
142 | switch (bagnid) { | ||
143 | |||
144 | case NID_x509Certificate: | ||
145 | M_ASN1_D2I_get_EXP_opt (ret->value.x509cert, | ||
146 | d2i_ASN1_OCTET_STRING, 0); | ||
147 | break; | ||
148 | |||
149 | case NID_x509Crl: | ||
150 | M_ASN1_D2I_get_EXP_opt (ret->value.x509crl, | ||
151 | d2i_ASN1_OCTET_STRING, 0); | ||
152 | break; | ||
153 | |||
154 | case NID_sdsiCertificate: | ||
155 | M_ASN1_D2I_get_EXP_opt (ret->value.sdsicert, | ||
156 | d2i_ASN1_IA5STRING, 0); | ||
157 | break; | ||
158 | |||
159 | default: | ||
160 | M_ASN1_D2I_get_EXP_opt (ret->value.other, | ||
161 | d2i_ASN1_TYPE, 0); | ||
162 | break; | ||
163 | } | ||
164 | |||
165 | M_ASN1_D2I_Finish(a, PKCS12_BAGS_free, ASN1_F_D2I_PKCS12_BAGS); | ||
166 | } | ||
167 | |||
168 | void PKCS12_BAGS_free (PKCS12_BAGS *a) | ||
169 | { | ||
170 | if (a == NULL) return; | ||
171 | switch (OBJ_obj2nid(a->type)) { | ||
172 | |||
173 | case NID_x509Certificate: | ||
174 | M_ASN1_OCTET_STRING_free (a->value.x509cert); | ||
175 | break; | ||
176 | |||
177 | case NID_x509Crl: | ||
178 | M_ASN1_OCTET_STRING_free (a->value.x509crl); | ||
179 | break; | ||
180 | |||
181 | case NID_sdsiCertificate: | ||
182 | M_ASN1_IA5STRING_free (a->value.sdsicert); | ||
183 | break; | ||
184 | |||
185 | default: | ||
186 | ASN1_TYPE_free (a->value.other); | ||
187 | break; | ||
188 | } | ||
189 | |||
190 | ASN1_OBJECT_free (a->type); | ||
191 | OPENSSL_free (a); | ||
192 | } | ||
diff --git a/src/lib/libcrypto/pkcs12/p12_lib.c b/src/lib/libcrypto/pkcs12/p12_lib.c deleted file mode 100644 index 7d464e3a32..0000000000 --- a/src/lib/libcrypto/pkcs12/p12_lib.c +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | /* p12_lib.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * licensing@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/asn1_mac.h> | ||
62 | #include <openssl/pkcs12.h> | ||
63 | |||
64 | int i2d_PKCS12(PKCS12 *a, unsigned char **pp) | ||
65 | { | ||
66 | M_ASN1_I2D_vars(a); | ||
67 | |||
68 | M_ASN1_I2D_len (a->version, i2d_ASN1_INTEGER); | ||
69 | M_ASN1_I2D_len (a->authsafes, i2d_PKCS7); | ||
70 | M_ASN1_I2D_len (a->mac, i2d_PKCS12_MAC_DATA); | ||
71 | |||
72 | M_ASN1_I2D_seq_total(); | ||
73 | |||
74 | M_ASN1_I2D_put (a->version, i2d_ASN1_INTEGER); | ||
75 | M_ASN1_I2D_put (a->authsafes, i2d_PKCS7); | ||
76 | M_ASN1_I2D_put (a->mac, i2d_PKCS12_MAC_DATA); | ||
77 | |||
78 | M_ASN1_I2D_finish(); | ||
79 | } | ||
80 | |||
81 | PKCS12 *d2i_PKCS12(PKCS12 **a, unsigned char **pp, long length) | ||
82 | { | ||
83 | M_ASN1_D2I_vars(a,PKCS12 *,PKCS12_new); | ||
84 | M_ASN1_D2I_Init(); | ||
85 | M_ASN1_D2I_start_sequence(); | ||
86 | M_ASN1_D2I_get (ret->version, d2i_ASN1_INTEGER); | ||
87 | M_ASN1_D2I_get (ret->authsafes, d2i_PKCS7); | ||
88 | M_ASN1_D2I_get_opt (ret->mac, d2i_PKCS12_MAC_DATA, V_ASN1_SEQUENCE); | ||
89 | M_ASN1_D2I_Finish(a, PKCS12_free, ASN1_F_D2I_PKCS12); | ||
90 | } | ||
91 | |||
92 | PKCS12 *PKCS12_new(void) | ||
93 | { | ||
94 | PKCS12 *ret=NULL; | ||
95 | ASN1_CTX c; | ||
96 | M_ASN1_New_Malloc(ret, PKCS12); | ||
97 | ret->version=NULL; | ||
98 | ret->mac=NULL; | ||
99 | ret->authsafes=NULL; | ||
100 | return (ret); | ||
101 | M_ASN1_New_Error(ASN1_F_PKCS12_NEW); | ||
102 | } | ||
103 | |||
104 | void PKCS12_free (PKCS12 *a) | ||
105 | { | ||
106 | if (a == NULL) return; | ||
107 | M_ASN1_INTEGER_free(a->version); | ||
108 | PKCS12_MAC_DATA_free (a->mac); | ||
109 | PKCS7_free (a->authsafes); | ||
110 | OPENSSL_free (a); | ||
111 | } | ||
diff --git a/src/lib/libcrypto/pkcs12/p12_mac.c b/src/lib/libcrypto/pkcs12/p12_mac.c deleted file mode 100644 index fbd1eca24f..0000000000 --- a/src/lib/libcrypto/pkcs12/p12_mac.c +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
1 | /* p12_mac.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * licensing@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/asn1_mac.h> | ||
62 | #include <openssl/pkcs12.h> | ||
63 | |||
64 | int i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **pp) | ||
65 | { | ||
66 | M_ASN1_I2D_vars(a); | ||
67 | M_ASN1_I2D_len (a->dinfo, i2d_X509_SIG); | ||
68 | M_ASN1_I2D_len (a->salt, i2d_ASN1_OCTET_STRING); | ||
69 | M_ASN1_I2D_len (a->iter, i2d_ASN1_INTEGER); | ||
70 | |||
71 | M_ASN1_I2D_seq_total(); | ||
72 | |||
73 | M_ASN1_I2D_put (a->dinfo, i2d_X509_SIG); | ||
74 | M_ASN1_I2D_put (a->salt, i2d_ASN1_OCTET_STRING); | ||
75 | M_ASN1_I2D_put (a->iter, i2d_ASN1_INTEGER); | ||
76 | M_ASN1_I2D_finish(); | ||
77 | } | ||
78 | |||
79 | PKCS12_MAC_DATA *PKCS12_MAC_DATA_new(void) | ||
80 | { | ||
81 | PKCS12_MAC_DATA *ret=NULL; | ||
82 | ASN1_CTX c; | ||
83 | M_ASN1_New_Malloc(ret, PKCS12_MAC_DATA); | ||
84 | ret->dinfo = X509_SIG_new(); | ||
85 | ret->salt = M_ASN1_OCTET_STRING_new(); | ||
86 | ret->iter = NULL; | ||
87 | return(ret); | ||
88 | M_ASN1_New_Error(ASN1_F_PKCS12_MAC_DATA_NEW); | ||
89 | } | ||
90 | |||
91 | PKCS12_MAC_DATA *d2i_PKCS12_MAC_DATA(PKCS12_MAC_DATA **a, unsigned char **pp, | ||
92 | long length) | ||
93 | { | ||
94 | M_ASN1_D2I_vars(a,PKCS12_MAC_DATA *,PKCS12_MAC_DATA_new); | ||
95 | M_ASN1_D2I_Init(); | ||
96 | M_ASN1_D2I_start_sequence(); | ||
97 | M_ASN1_D2I_get(ret->dinfo, d2i_X509_SIG); | ||
98 | M_ASN1_D2I_get(ret->salt, d2i_ASN1_OCTET_STRING); | ||
99 | M_ASN1_D2I_get_opt(ret->iter, d2i_ASN1_INTEGER, V_ASN1_INTEGER); | ||
100 | M_ASN1_D2I_Finish(a, PKCS12_MAC_DATA_free, ASN1_F_D2I_PKCS12_MAC_DATA); | ||
101 | } | ||
102 | |||
103 | void PKCS12_MAC_DATA_free (PKCS12_MAC_DATA *a) | ||
104 | { | ||
105 | if (a == NULL) return; | ||
106 | X509_SIG_free (a->dinfo); | ||
107 | M_ASN1_OCTET_STRING_free(a->salt); | ||
108 | M_ASN1_INTEGER_free(a->iter); | ||
109 | OPENSSL_free (a); | ||
110 | } | ||
diff --git a/src/lib/libcrypto/pkcs12/p12_sbag.c b/src/lib/libcrypto/pkcs12/p12_sbag.c deleted file mode 100644 index 64ac32ee6f..0000000000 --- a/src/lib/libcrypto/pkcs12/p12_sbag.c +++ /dev/null | |||
@@ -1,234 +0,0 @@ | |||
1 | /* p12_sbag.c */ | ||
2 | /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * licensing@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/asn1_mac.h> | ||
62 | #include <openssl/pkcs12.h> | ||
63 | |||
64 | int i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **pp) | ||
65 | { | ||
66 | int bagnid, v = 0; | ||
67 | M_ASN1_I2D_vars(a); | ||
68 | bagnid = OBJ_obj2nid (a->type); | ||
69 | M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT); | ||
70 | |||
71 | switch (bagnid) { | ||
72 | |||
73 | case NID_keyBag: | ||
74 | M_ASN1_I2D_len_EXP_opt (a->value.keybag, | ||
75 | i2d_PKCS8_PRIV_KEY_INFO, 0, v); | ||
76 | break; | ||
77 | |||
78 | case NID_pkcs8ShroudedKeyBag: | ||
79 | M_ASN1_I2D_len_EXP_opt (a->value.shkeybag, | ||
80 | i2d_X509_SIG, 0, v); | ||
81 | break; | ||
82 | |||
83 | case NID_safeContentsBag: | ||
84 | M_ASN1_I2D_len_EXP_SEQUENCE_opt_type | ||
85 | (PKCS12_SAFEBAG, a->value.safes, i2d_PKCS12_SAFEBAG, | ||
86 | 0, V_ASN1_SEQUENCE, v); | ||
87 | break; | ||
88 | |||
89 | case NID_certBag: | ||
90 | case NID_crlBag: | ||
91 | case NID_secretBag: | ||
92 | M_ASN1_I2D_len_EXP_opt (a->value.bag, | ||
93 | i2d_PKCS12_BAGS, 0, v); | ||
94 | break; | ||
95 | |||
96 | default: | ||
97 | M_ASN1_I2D_len_EXP_opt (a->value.other, | ||
98 | i2d_ASN1_TYPE, 0, v); | ||
99 | break; | ||
100 | } | ||
101 | |||
102 | M_ASN1_I2D_len_SET_type (X509_ATTRIBUTE,a->attrib, i2d_X509_ATTRIBUTE); | ||
103 | |||
104 | M_ASN1_I2D_seq_total (); | ||
105 | |||
106 | M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT); | ||
107 | |||
108 | switch (bagnid) { | ||
109 | |||
110 | case NID_keyBag: | ||
111 | M_ASN1_I2D_put_EXP_opt (a->value.keybag, | ||
112 | i2d_PKCS8_PRIV_KEY_INFO, 0, v); | ||
113 | break; | ||
114 | |||
115 | case NID_pkcs8ShroudedKeyBag: | ||
116 | M_ASN1_I2D_put_EXP_opt (a->value.shkeybag, | ||
117 | i2d_X509_SIG, 0, v); | ||
118 | break; | ||
119 | |||
120 | case NID_safeContentsBag: | ||
121 | M_ASN1_I2D_put_EXP_SEQUENCE_opt_type | ||
122 | (PKCS12_SAFEBAG, a->value.safes, i2d_PKCS12_SAFEBAG, | ||
123 | 0, V_ASN1_SEQUENCE, v); | ||
124 | break; | ||
125 | |||
126 | case NID_certBag: | ||
127 | case NID_crlBag: | ||
128 | case NID_secretBag: | ||
129 | M_ASN1_I2D_put_EXP_opt (a->value.bag, | ||
130 | i2d_PKCS12_BAGS, 0, v); | ||
131 | break; | ||
132 | |||
133 | default: | ||
134 | M_ASN1_I2D_put_EXP_opt (a->value.other, | ||
135 | i2d_ASN1_TYPE, 0, v); | ||
136 | break; | ||
137 | } | ||
138 | |||
139 | M_ASN1_I2D_put_SET_type (X509_ATTRIBUTE, a->attrib, i2d_X509_ATTRIBUTE); | ||
140 | |||
141 | M_ASN1_I2D_finish(); | ||
142 | } | ||
143 | |||
144 | PKCS12_SAFEBAG *PKCS12_SAFEBAG_new(void) | ||
145 | { | ||
146 | PKCS12_SAFEBAG *ret=NULL; | ||
147 | ASN1_CTX c; | ||
148 | M_ASN1_New_Malloc(ret, PKCS12_SAFEBAG); | ||
149 | ret->type=NULL; | ||
150 | ret->value.other=NULL; | ||
151 | M_ASN1_New(ret->attrib, sk_X509_ATTRIBUTE_new_null); | ||
152 | ret->rest=NULL; | ||
153 | return (ret); | ||
154 | M_ASN1_New_Error(ASN1_F_PKCS12_SAFEBAG_NEW); | ||
155 | } | ||
156 | |||
157 | PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(PKCS12_SAFEBAG **a, unsigned char **pp, | ||
158 | long length) | ||
159 | { | ||
160 | int bagnid; | ||
161 | M_ASN1_D2I_vars(a,PKCS12_SAFEBAG *,PKCS12_SAFEBAG_new); | ||
162 | M_ASN1_D2I_Init(); | ||
163 | M_ASN1_D2I_start_sequence(); | ||
164 | M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT); | ||
165 | bagnid = OBJ_obj2nid (ret->type); | ||
166 | |||
167 | switch (bagnid) { | ||
168 | |||
169 | case NID_keyBag: | ||
170 | M_ASN1_D2I_get_EXP_opt (ret->value.keybag, | ||
171 | d2i_PKCS8_PRIV_KEY_INFO, 0); | ||
172 | break; | ||
173 | |||
174 | case NID_pkcs8ShroudedKeyBag: | ||
175 | M_ASN1_D2I_get_EXP_opt (ret->value.shkeybag, | ||
176 | d2i_X509_SIG, 0); | ||
177 | break; | ||
178 | |||
179 | case NID_safeContentsBag: | ||
180 | M_ASN1_D2I_get_EXP_set_opt_type | ||
181 | (PKCS12_SAFEBAG, ret->value.safes, | ||
182 | d2i_PKCS12_SAFEBAG, PKCS12_SAFEBAG_free, 0, | ||
183 | V_ASN1_SEQUENCE); | ||
184 | break; | ||
185 | |||
186 | case NID_certBag: | ||
187 | case NID_crlBag: | ||
188 | case NID_secretBag: | ||
189 | M_ASN1_D2I_get_EXP_opt (ret->value.bag, | ||
190 | d2i_PKCS12_BAGS, 0); | ||
191 | break; | ||
192 | |||
193 | default: | ||
194 | M_ASN1_D2I_get_EXP_opt (ret->value.other, | ||
195 | d2i_ASN1_TYPE, 0); | ||
196 | break; | ||
197 | } | ||
198 | M_ASN1_D2I_get_set_opt_type(X509_ATTRIBUTE,ret->attrib, | ||
199 | d2i_X509_ATTRIBUTE,X509_ATTRIBUTE_free); | ||
200 | M_ASN1_D2I_Finish(a, PKCS12_SAFEBAG_free, ASN1_F_D2I_PKCS12_SAFEBAG); | ||
201 | } | ||
202 | |||
203 | void PKCS12_SAFEBAG_free (PKCS12_SAFEBAG *a) | ||
204 | { | ||
205 | if (a == NULL) return; | ||
206 | switch (OBJ_obj2nid(a->type)) { | ||
207 | |||
208 | case NID_keyBag: | ||
209 | PKCS8_PRIV_KEY_INFO_free (a->value.keybag); | ||
210 | break; | ||
211 | |||
212 | case NID_pkcs8ShroudedKeyBag: | ||
213 | X509_SIG_free (a->value.shkeybag); | ||
214 | break; | ||
215 | |||
216 | case NID_certBag: | ||
217 | case NID_crlBag: | ||
218 | case NID_secretBag: | ||
219 | PKCS12_BAGS_free (a->value.bag); | ||
220 | break; | ||
221 | |||
222 | default: | ||
223 | ASN1_TYPE_free (a->value.other); | ||
224 | break; | ||
225 | } | ||
226 | |||
227 | ASN1_OBJECT_free (a->type); | ||
228 | sk_X509_ATTRIBUTE_pop_free (a->attrib, X509_ATTRIBUTE_free); | ||
229 | OPENSSL_free (a); | ||
230 | } | ||
231 | |||
232 | IMPLEMENT_STACK_OF(PKCS12_SAFEBAG) | ||
233 | IMPLEMENT_ASN1_SET_OF(PKCS12_SAFEBAG) | ||
234 | IMPLEMENT_PKCS12_STACK_OF(PKCS12_SAFEBAG) | ||