summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/a_bool.c
diff options
context:
space:
mode:
authorjsing <>2014-04-17 16:14:15 +0000
committerjsing <>2014-04-17 16:14:15 +0000
commit574615861e3df22894a32f87f1f6650a0f1073c8 (patch)
treebe2338f314e3adfbaa6821139dc5a3e45922cb61 /src/lib/libcrypto/asn1/a_bool.c
parent18c3f2b77b5cab0b6689479dee685aff2566defe (diff)
downloadopenbsd-574615861e3df22894a32f87f1f6650a0f1073c8.tar.gz
openbsd-574615861e3df22894a32f87f1f6650a0f1073c8.tar.bz2
openbsd-574615861e3df22894a32f87f1f6650a0f1073c8.zip
Initial KNF.
Diffstat (limited to 'src/lib/libcrypto/asn1/a_bool.c')
-rw-r--r--src/lib/libcrypto/asn1/a_bool.c86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/lib/libcrypto/asn1/a_bool.c b/src/lib/libcrypto/asn1/a_bool.c
index 331acdf053..c8c180d6f7 100644
--- a/src/lib/libcrypto/asn1/a_bool.c
+++ b/src/lib/libcrypto/asn1/a_bool.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
@@ -60,55 +60,55 @@
60#include "cryptlib.h" 60#include "cryptlib.h"
61#include <openssl/asn1t.h> 61#include <openssl/asn1t.h>
62 62
63int i2d_ASN1_BOOLEAN(int a, unsigned char **pp) 63int
64 { 64i2d_ASN1_BOOLEAN(int a, unsigned char **pp)
65{
65 int r; 66 int r;
66 unsigned char *p; 67 unsigned char *p;
67 68
68 r=ASN1_object_size(0,1,V_ASN1_BOOLEAN); 69 r = ASN1_object_size(0, 1, V_ASN1_BOOLEAN);
69 if (pp == NULL) return(r); 70 if (pp == NULL)
70 p= *pp; 71 return (r);
72 p = *pp;
71 73
72 ASN1_put_object(&p,0,1,V_ASN1_BOOLEAN,V_ASN1_UNIVERSAL); 74 ASN1_put_object(&p, 0, 1, V_ASN1_BOOLEAN, V_ASN1_UNIVERSAL);
73 *(p++)= (unsigned char)a; 75 *(p++) = (unsigned char)a;
74 *pp=p; 76 *pp = p;
75 return(r); 77 return (r);
76 } 78}
77 79
78int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length) 80int
79 { 81d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length)
80 int ret= -1; 82{
83 int ret = -1;
81 const unsigned char *p; 84 const unsigned char *p;
82 long len; 85 long len;
83 int inf,tag,xclass; 86 int inf, tag, xclass;
84 int i=0; 87 int i = 0;
85 88
86 p= *pp; 89 p = *pp;
87 inf=ASN1_get_object(&p,&len,&tag,&xclass,length); 90 inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
88 if (inf & 0x80) 91 if (inf & 0x80) {
89 { 92 i = ASN1_R_BAD_OBJECT_HEADER;
90 i=ASN1_R_BAD_OBJECT_HEADER;
91 goto err; 93 goto err;
92 } 94 }
93 95
94 if (tag != V_ASN1_BOOLEAN) 96 if (tag != V_ASN1_BOOLEAN) {
95 { 97 i = ASN1_R_EXPECTING_A_BOOLEAN;
96 i=ASN1_R_EXPECTING_A_BOOLEAN;
97 goto err; 98 goto err;
98 } 99 }
99 100
100 if (len != 1) 101 if (len != 1) {
101 { 102 i = ASN1_R_BOOLEAN_IS_WRONG_LENGTH;
102 i=ASN1_R_BOOLEAN_IS_WRONG_LENGTH;
103 goto err; 103 goto err;
104 }
105 ret= (int)*(p++);
106 if (a != NULL) (*a)=ret;
107 *pp=p;
108 return(ret);
109err:
110 ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,i);
111 return(ret);
112 } 104 }
105 ret = (int)*(p++);
106 if (a != NULL)
107 (*a) = ret;
108 *pp = p;
109 return (ret);
113 110
114 111err:
112 ASN1err(ASN1_F_D2I_ASN1_BOOLEAN, i);
113 return (ret);
114}