diff options
author | tb <> | 2023-07-28 10:02:11 +0000 |
---|---|---|
committer | tb <> | 2023-07-28 10:02:11 +0000 |
commit | 8d8ca2c8c440c1df72455fe4055627e4110c3973 (patch) | |
tree | 1367f561dd03f95b820968cb0b6444737ae3cb13 /src/lib/libcrypto/asn1/t_pkey.c | |
parent | f0045e366b4be4794ddf9c7123b1bb43169d83ea (diff) | |
download | openbsd-8d8ca2c8c440c1df72455fe4055627e4110c3973.tar.gz openbsd-8d8ca2c8c440c1df72455fe4055627e4110c3973.tar.bz2 openbsd-8d8ca2c8c440c1df72455fe4055627e4110c3973.zip |
Remove ASN1_bn_print() and ASN1_buf_print()
ASN1_bn_print() is a hilariously bad API that was replaced with a saner
interface internally. ASN1_buf_print() isn't terrible, but it is too
specialized to be of real use. It was only exposed because ASN1_bn_print()
was already there. Its only use had been in the EdDSA printing code before
it was replaced with an internal helper.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/asn1/t_pkey.c')
-rw-r--r-- | src/lib/libcrypto/asn1/t_pkey.c | 147 |
1 files changed, 0 insertions, 147 deletions
diff --git a/src/lib/libcrypto/asn1/t_pkey.c b/src/lib/libcrypto/asn1/t_pkey.c deleted file mode 100644 index 3257cd08c8..0000000000 --- a/src/lib/libcrypto/asn1/t_pkey.c +++ /dev/null | |||
@@ -1,147 +0,0 @@ | |||
1 | /* $OpenBSD: t_pkey.c,v 1.20 2023/07/05 21:23:36 beck Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
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 | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
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. | ||
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. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
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: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
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 | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
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 | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | |||
61 | #include <openssl/bn.h> | ||
62 | #include <openssl/buffer.h> | ||
63 | #include <openssl/objects.h> | ||
64 | |||
65 | #include "bn_local.h" | ||
66 | |||
67 | int | ||
68 | ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num, | ||
69 | unsigned char *buf, int off) | ||
70 | { | ||
71 | int n, i; | ||
72 | const char *neg; | ||
73 | |||
74 | if (num == NULL) | ||
75 | return (1); | ||
76 | neg = (BN_is_negative(num)) ? "-" : ""; | ||
77 | if (!BIO_indent(bp, off, 128)) | ||
78 | return 0; | ||
79 | if (BN_is_zero(num)) { | ||
80 | if (BIO_printf(bp, "%s 0\n", number) <= 0) | ||
81 | return 0; | ||
82 | return 1; | ||
83 | } | ||
84 | |||
85 | if (BN_num_bytes(num) <= BN_BYTES) { | ||
86 | if (BIO_printf(bp, "%s %s%lu (%s0x%lx)\n", number, neg, | ||
87 | (unsigned long)num->d[0], neg, | ||
88 | (unsigned long)num->d[0]) <= 0) | ||
89 | return (0); | ||
90 | } else { | ||
91 | buf[0] = 0; | ||
92 | if (BIO_printf(bp, "%s%s", number, | ||
93 | (neg[0] == '-') ? " (Negative)" : "") <= 0) | ||
94 | return (0); | ||
95 | n = BN_bn2bin(num, &buf[1]); | ||
96 | |||
97 | if (buf[1] & 0x80) | ||
98 | n++; | ||
99 | else | ||
100 | buf++; | ||
101 | |||
102 | for (i = 0; i < n; i++) { | ||
103 | if ((i % 15) == 0) { | ||
104 | if (BIO_puts(bp, "\n") <= 0 || | ||
105 | !BIO_indent(bp, off + 4, 128)) | ||
106 | return 0; | ||
107 | } | ||
108 | if (BIO_printf(bp, "%02x%s", buf[i], | ||
109 | ((i + 1) == n) ? "" : ":") <= 0) | ||
110 | return (0); | ||
111 | } | ||
112 | if (BIO_write(bp, "\n", 1) <= 0) | ||
113 | return (0); | ||
114 | } | ||
115 | return (1); | ||
116 | } | ||
117 | LCRYPTO_ALIAS(ASN1_bn_print); | ||
118 | |||
119 | #define ASN1_BUF_PRINT_WIDTH 15 | ||
120 | #define ASN1_BUF_PRINT_MAX_INDENT 64 | ||
121 | |||
122 | int | ||
123 | ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int indent) | ||
124 | { | ||
125 | size_t i; | ||
126 | |||
127 | for (i = 0; i < buflen; i++) { | ||
128 | if ((i % ASN1_BUF_PRINT_WIDTH) == 0) { | ||
129 | if (i > 0 && BIO_puts(bp, "\n") <= 0) | ||
130 | return 0; | ||
131 | if (!BIO_indent(bp, indent, ASN1_BUF_PRINT_MAX_INDENT)) | ||
132 | return 0; | ||
133 | } | ||
134 | /* | ||
135 | * Use colon separators for each octet for compatibility as | ||
136 | * this function is used to print out key components. | ||
137 | */ | ||
138 | if (BIO_printf(bp, "%02x%s", buf[i], | ||
139 | (i == buflen - 1) ? "" : ":") <= 0) | ||
140 | return 0; | ||
141 | } | ||
142 | if (BIO_write(bp, "\n", 1) <= 0) | ||
143 | return 0; | ||
144 | |||
145 | return 1; | ||
146 | } | ||
147 | LCRYPTO_ALIAS(ASN1_buf_print); | ||