Deleted Added
full compact
a_print.c (1.1.1.2) a_print.c (1.1.1.3)
1/* crypto/asn1/a_print.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
1/*
2 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
4 *
3 *
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.]
4 * Licensed under the OpenSSL license (the "License"). You may not use
5 * this file except in compliance with the License. You can obtain a copy
6 * in the file LICENSE in the source distribution or at
7 * https://www.openssl.org/source/license.html
57 */
58
59#include <stdio.h>
8 */
9
10#include <stdio.h>
60#include "cryptlib.h"
11#include <ctype.h>
12#include "internal/cryptlib.h"
61#include <openssl/asn1.h>
62
63int ASN1_PRINTABLE_type(const unsigned char *s, int len)
64{
65 int c;
66 int ia5 = 0;
67 int t61 = 0;
68
69 if (len <= 0)
70 len = -1;
71 if (s == NULL)
72 return (V_ASN1_PRINTABLESTRING);
73
74 while ((*s) && (len-- != 0)) {
75 c = *(s++);
76#ifndef CHARSET_EBCDIC
77 if (!(((c >= 'a') && (c <= 'z')) ||
78 ((c >= 'A') && (c <= 'Z')) ||
13#include <openssl/asn1.h>
14
15int ASN1_PRINTABLE_type(const unsigned char *s, int len)
16{
17 int c;
18 int ia5 = 0;
19 int t61 = 0;
20
21 if (len <= 0)
22 len = -1;
23 if (s == NULL)
24 return (V_ASN1_PRINTABLESTRING);
25
26 while ((*s) && (len-- != 0)) {
27 c = *(s++);
28#ifndef CHARSET_EBCDIC
29 if (!(((c >= 'a') && (c <= 'z')) ||
30 ((c >= 'A') && (c <= 'Z')) ||
79 (c == ' ') ||
80 ((c >= '0') && (c <= '9')) ||
81 (c == ' ') || (c == '\'') ||
82 (c == '(') || (c == ')') ||
83 (c == '+') || (c == ',') ||
84 (c == '-') || (c == '.') ||
85 (c == '/') || (c == ':') || (c == '=') || (c == '?')))
86 ia5 = 1;
87 if (c & 0x80)

--- 34 unchanged lines hidden (view full) ---

122 for (i = 3; i < s->length; i += 4) {
123 *(p++) = s->data[i];
124 }
125 *(p) = '\0';
126 s->length /= 4;
127 s->type = ASN1_PRINTABLE_type(s->data, s->length);
128 return (1);
129}
31 ((c >= '0') && (c <= '9')) ||
32 (c == ' ') || (c == '\'') ||
33 (c == '(') || (c == ')') ||
34 (c == '+') || (c == ',') ||
35 (c == '-') || (c == '.') ||
36 (c == '/') || (c == ':') || (c == '=') || (c == '?')))
37 ia5 = 1;
38 if (c & 0x80)

--- 34 unchanged lines hidden (view full) ---

73 for (i = 3; i < s->length; i += 4) {
74 *(p++) = s->data[i];
75 }
76 *(p) = '\0';
77 s->length /= 4;
78 s->type = ASN1_PRINTABLE_type(s->data, s->length);
79 return (1);
80}
81
82int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
83{
84 int i, n;
85 char buf[80];
86 const char *p;
87
88 if (v == NULL)
89 return (0);
90 n = 0;
91 p = (const char *)v->data;
92 for (i = 0; i < v->length; i++) {
93 if ((p[i] > '~') || ((p[i] < ' ') &&
94 (p[i] != '\n') && (p[i] != '\r')))
95 buf[n] = '.';
96 else
97 buf[n] = p[i];
98 n++;
99 if (n >= 80) {
100 if (BIO_write(bp, buf, n) <= 0)
101 return (0);
102 n = 0;
103 }
104 }
105 if (n > 0)
106 if (BIO_write(bp, buf, n) <= 0)
107 return (0);
108 return (1);
109}