diff options
author | tb <> | 2024-01-27 17:14:33 +0000 |
---|---|---|
committer | tb <> | 2024-01-27 17:14:33 +0000 |
commit | 282547129442bcb72f9be8786b1c02a10cfc330d (patch) | |
tree | 9ee1fa5f2616af5e75755c62583db2a771d55e19 /src/lib/libcrypto/pkcs12/p12_crpt.c | |
parent | 3e40679b6f3d8df4a6014838542e2caa8358df08 (diff) | |
download | openbsd-282547129442bcb72f9be8786b1c02a10cfc330d.tar.gz openbsd-282547129442bcb72f9be8786b1c02a10cfc330d.tar.bz2 openbsd-282547129442bcb72f9be8786b1c02a10cfc330d.zip |
Fold keyivgen functions into evp_pbe.c
These are only used by the EVP_PBE routines and will become internal in
the next major bump.
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_crpt.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_crpt.c | 123 |
1 files changed, 0 insertions, 123 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crpt.c b/src/lib/libcrypto/pkcs12/p12_crpt.c deleted file mode 100644 index e7d30101c3..0000000000 --- a/src/lib/libcrypto/pkcs12/p12_crpt.c +++ /dev/null | |||
@@ -1,123 +0,0 @@ | |||
1 | /* $OpenBSD: p12_crpt.c,v 1.17 2023/02/16 08:38:17 tb Exp $ */ | ||
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) 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 <string.h> | ||
61 | |||
62 | #include <openssl/err.h> | ||
63 | #include <openssl/pkcs12.h> | ||
64 | |||
65 | /* PKCS#12 PBE algorithms now in static table */ | ||
66 | |||
67 | void | ||
68 | PKCS12_PBE_add(void) | ||
69 | { | ||
70 | } | ||
71 | LCRYPTO_ALIAS(PKCS12_PBE_add); | ||
72 | |||
73 | int | ||
74 | PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | ||
75 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de) | ||
76 | { | ||
77 | PBEPARAM *pbe; | ||
78 | int saltlen, iter, ret; | ||
79 | unsigned char *salt; | ||
80 | const unsigned char *pbuf; | ||
81 | unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH]; | ||
82 | |||
83 | /* Extract useful info from parameter */ | ||
84 | if (param == NULL || param->type != V_ASN1_SEQUENCE || | ||
85 | param->value.sequence == NULL) { | ||
86 | PKCS12error(PKCS12_R_DECODE_ERROR); | ||
87 | return 0; | ||
88 | } | ||
89 | |||
90 | pbuf = param->value.sequence->data; | ||
91 | if (!(pbe = d2i_PBEPARAM(NULL, &pbuf, param->value.sequence->length))) { | ||
92 | PKCS12error(PKCS12_R_DECODE_ERROR); | ||
93 | return 0; | ||
94 | } | ||
95 | |||
96 | if (!pbe->iter) | ||
97 | iter = 1; | ||
98 | else if ((iter = ASN1_INTEGER_get(pbe->iter)) <= 0) { | ||
99 | PKCS12error(PKCS12_R_DECODE_ERROR); | ||
100 | PBEPARAM_free(pbe); | ||
101 | return 0; | ||
102 | } | ||
103 | salt = pbe->salt->data; | ||
104 | saltlen = pbe->salt->length; | ||
105 | if (!PKCS12_key_gen(pass, passlen, salt, saltlen, PKCS12_KEY_ID, | ||
106 | iter, EVP_CIPHER_key_length(cipher), key, md)) { | ||
107 | PKCS12error(PKCS12_R_KEY_GEN_ERROR); | ||
108 | PBEPARAM_free(pbe); | ||
109 | return 0; | ||
110 | } | ||
111 | if (!PKCS12_key_gen(pass, passlen, salt, saltlen, PKCS12_IV_ID, | ||
112 | iter, EVP_CIPHER_iv_length(cipher), iv, md)) { | ||
113 | PKCS12error(PKCS12_R_IV_GEN_ERROR); | ||
114 | PBEPARAM_free(pbe); | ||
115 | return 0; | ||
116 | } | ||
117 | PBEPARAM_free(pbe); | ||
118 | ret = EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, en_de); | ||
119 | explicit_bzero(key, EVP_MAX_KEY_LENGTH); | ||
120 | explicit_bzero(iv, EVP_MAX_IV_LENGTH); | ||
121 | return ret; | ||
122 | } | ||
123 | LCRYPTO_ALIAS(PKCS12_PBE_keyivgen); | ||