summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x_all.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/x509/x_all.c')
-rw-r--r--src/lib/libcrypto/x509/x_all.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
index 2edec16022..92f80ca433 100644
--- a/src/lib/libcrypto/x509/x_all.c
+++ b/src/lib/libcrypto/x509/x_all.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
@@ -466,7 +466,7 @@ int
466X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md, 466X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md,
467 unsigned int *len) 467 unsigned int *len)
468{ 468{
469 return (ASN1_item_digest(ASN1_ITEM_rptr(X509_REQ), type,(char *)data, 469 return (ASN1_item_digest(ASN1_ITEM_rptr(X509_REQ), type, (char *)data,
470 md, len)); 470 md, len));
471} 471}
472 472
@@ -474,7 +474,7 @@ int
474X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md, 474X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md,
475 unsigned int *len) 475 unsigned int *len)
476{ 476{
477 return (ASN1_item_digest(ASN1_ITEM_rptr(X509_NAME), type,(char *)data, 477 return (ASN1_item_digest(ASN1_ITEM_rptr(X509_NAME), type, (char *)data,
478 md, len)); 478 md, len));
479} 479}
480 480
@@ -515,8 +515,7 @@ i2d_PKCS8_bio(BIO *bp, X509_SIG *p8)
515 515
516#ifndef OPENSSL_NO_FP_API 516#ifndef OPENSSL_NO_FP_API
517PKCS8_PRIV_KEY_INFO * 517PKCS8_PRIV_KEY_INFO *
518d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, 518d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO **p8inf)
519PKCS8_PRIV_KEY_INFO **p8inf)
520{ 519{
521 return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new, 520 return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
522 d2i_PKCS8_PRIV_KEY_INFO, fp, p8inf); 521 d2i_PKCS8_PRIV_KEY_INFO, fp, p8inf);
@@ -570,8 +569,7 @@ d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a)
570#endif 569#endif
571 570
572PKCS8_PRIV_KEY_INFO * 571PKCS8_PRIV_KEY_INFO *
573d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, 572d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO **p8inf)
574PKCS8_PRIV_KEY_INFO **p8inf)
575{ 573{
576 return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new, 574 return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
577 d2i_PKCS8_PRIV_KEY_INFO, bp, p8inf); 575 d2i_PKCS8_PRIV_KEY_INFO, bp, p8inf);
@@ -589,6 +587,7 @@ i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key)
589{ 587{
590 PKCS8_PRIV_KEY_INFO *p8inf; 588 PKCS8_PRIV_KEY_INFO *p8inf;
591 int ret; 589 int ret;
590
592 p8inf = EVP_PKEY2PKCS8(key); 591 p8inf = EVP_PKEY2PKCS8(key);
593 if (!p8inf) 592 if (!p8inf)
594 return 0; 593 return 0;
@@ -606,7 +605,8 @@ i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey)
606EVP_PKEY * 605EVP_PKEY *
607d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) 606d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a)
608{ 607{
609 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a); 608 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey,
609 bp, a);
610} 610}
611 611
612int 612int