Deleted Added
sdiff udiff text old ( 194206 ) new ( 238405 )
full compact
t_req.c (194206) t_req.c (238405)
1/* crypto/asn1/t_req.c */
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 *

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

144
145 pkey=X509_REQ_get_pubkey(x);
146 if (pkey == NULL)
147 {
148 BIO_printf(bp,"%12sUnable to load Public Key\n","");
149 ERR_print_errors(bp);
150 }
151 else
1/* crypto/asn1/t_req.c */
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 *

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

144
145 pkey=X509_REQ_get_pubkey(x);
146 if (pkey == NULL)
147 {
148 BIO_printf(bp,"%12sUnable to load Public Key\n","");
149 ERR_print_errors(bp);
150 }
151 else
152#ifndef OPENSSL_NO_RSA
153 if (pkey->type == EVP_PKEY_RSA)
154 {
152 {
155 BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","",
156 BN_num_bits(pkey->pkey.rsa->n));
157 RSA_print(bp,pkey->pkey.rsa,16);
153 EVP_PKEY_print_public(bp, pkey, 16, NULL);
154 EVP_PKEY_free(pkey);
158 }
155 }
159 else
160#endif
161#ifndef OPENSSL_NO_DSA
162 if (pkey->type == EVP_PKEY_DSA)
163 {
164 BIO_printf(bp,"%12sDSA Public Key:\n","");
165 DSA_print(bp,pkey->pkey.dsa,16);
166 }
167 else
168#endif
169#ifndef OPENSSL_NO_EC
170 if (pkey->type == EVP_PKEY_EC)
171 {
172 BIO_printf(bp, "%12sEC Public Key: \n","");
173 EC_KEY_print(bp, pkey->pkey.ec, 16);
174 }
156 }
175 else
176#endif
177 BIO_printf(bp,"%12sUnknown Public Key:\n","");
178
157
179 EVP_PKEY_free(pkey);
180 }
181
182 if(!(cflag & X509_FLAG_NO_ATTRIBUTES))
183 {
184 /* may not be */
185 if(BIO_printf(bp,"%8sAttributes:\n","") <= 0)
186 goto err;
187
188 sk=x->req_info->attributes;
189 if (sk_X509_ATTRIBUTE_num(sk) == 0)

--- 101 unchanged lines hidden --- 		158 if(!(cflag & X509_FLAG_NO_ATTRIBUTES))
159 {
160 /* may not be */
161 if(BIO_printf(bp,"%8sAttributes:\n","") <= 0)
162 goto err;
163
164 sk=x->req_info->attributes;
165 if (sk_X509_ATTRIBUTE_num(sk) == 0)

--- 101 unchanged lines hidden ---