summaryrefslogtreecommitdiff
path: root/lib/libcrypto/pem
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libcrypto/pem')
-rw-r--r--lib/libcrypto/pem/pem_all.c16
-rw-r--r--lib/libcrypto/pem/pem_info.c15
-rw-r--r--lib/libcrypto/pem/pem_lib.c13
-rw-r--r--lib/libcrypto/pem/pem_oth.c9
-rw-r--r--lib/libcrypto/pem/pem_pk8.c11
-rw-r--r--lib/libcrypto/pem/pem_pkey.c11
-rw-r--r--lib/libcrypto/pem/pem_seal.c7
-rw-r--r--lib/libcrypto/pem/pem_sign.c9
-rw-r--r--lib/libcrypto/pem/pem_x509.c8
-rw-r--r--lib/libcrypto/pem/pem_xaux.c8
-rw-r--r--lib/libcrypto/pem/pvkfmt.c7
11 files changed, 61 insertions, 53 deletions
diff --git a/lib/libcrypto/pem/pem_all.c b/lib/libcrypto/pem/pem_all.c
index e883acdc655..7df917b01c9 100644
--- a/lib/libcrypto/pem/pem_all.c
+++ b/lib/libcrypto/pem/pem_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_all.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: pem_all.c,v 1.15 2014/07/11 08:44:49 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -113,20 +113,20 @@
#include <openssl/opensslconf.h>
-#include "cryptlib.h"
#include <openssl/bio.h>
#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pkcs7.h>
#include <openssl/pem.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
+#include <openssl/pkcs7.h>
+#include <openssl/x509.h>
+
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
#endif
#ifndef OPENSSL_NO_DSA
#include <openssl/dsa.h>
#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_RSA
diff --git a/lib/libcrypto/pem/pem_info.c b/lib/libcrypto/pem/pem_info.c
index eaf70e4267d..9ddcb565969 100644
--- a/lib/libcrypto/pem/pem_info.c
+++ b/lib/libcrypto/pem/pem_info.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_info.c,v 1.18 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: pem_info.c,v 1.19 2014/07/11 08:44:49 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -61,18 +61,19 @@
#include <openssl/opensslconf.h>
-#include "cryptlib.h"
#include <openssl/buffer.h>
-#include <openssl/objects.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
-#include <openssl/x509.h>
+#include <openssl/objects.h>
#include <openssl/pem.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
+#include <openssl/x509.h>
+
#ifndef OPENSSL_NO_DSA
#include <openssl/dsa.h>
#endif
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
STACK_OF(X509_INFO) *
PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
diff --git a/lib/libcrypto/pem/pem_lib.c b/lib/libcrypto/pem/pem_lib.c
index 70e2aa633dd..8e5c82c245c 100644
--- a/lib/libcrypto/pem/pem_lib.c
+++ b/lib/libcrypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_lib.c,v 1.32 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: pem_lib.c,v 1.33 2014/07/11 08:44:49 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -62,15 +62,14 @@
#include <openssl/opensslconf.h>
-#include "cryptlib.h"
#include <openssl/buffer.h>
-#include <openssl/objects.h>
#include <openssl/evp.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
+#include <openssl/objects.h>
#include <openssl/pem.h>
#include <openssl/pkcs12.h>
-#include "asn1_locl.h"
+#include <openssl/rand.h>
+#include <openssl/x509.h>
+
#ifndef OPENSSL_NO_DES
#include <openssl/des.h>
#endif
@@ -78,6 +77,8 @@
#include <openssl/engine.h>
#endif
+#include "asn1_locl.h"
+
#define MIN_LENGTH 4
static int load_iv(char **fromp, unsigned char *to, int num);
diff --git a/lib/libcrypto/pem/pem_oth.c b/lib/libcrypto/pem/pem_oth.c
index 41a1696f9a5..d56c6b26d14 100644
--- a/lib/libcrypto/pem/pem_oth.c
+++ b/lib/libcrypto/pem/pem_oth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_oth.c,v 1.5 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: pem_oth.c,v 1.6 2014/07/11 08:44:49 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -57,13 +57,14 @@
*/
#include <stdio.h>
-#include "cryptlib.h"
+
#include <openssl/buffer.h>
-#include <openssl/objects.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
#include <openssl/rand.h>
#include <openssl/x509.h>
-#include <openssl/pem.h>
/* Handle 'other' PEMs: not private keys */
diff --git a/lib/libcrypto/pem/pem_pk8.c b/lib/libcrypto/pem/pem_pk8.c
index fc538260773..dafbd13814b 100644
--- a/lib/libcrypto/pem/pem_pk8.c
+++ b/lib/libcrypto/pem/pem_pk8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_pk8.c,v 1.6 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: pem_pk8.c,v 1.7 2014/07/11 08:44:49 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -57,14 +57,15 @@
*/
#include <stdio.h>
-#include "cryptlib.h"
+
#include <openssl/buffer.h>
-#include <openssl/objects.h>
+#include <openssl/err.h>
#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
+#include <openssl/pkcs12.h>
#include <openssl/rand.h>
#include <openssl/x509.h>
-#include <openssl/pkcs12.h>
-#include <openssl/pem.h>
static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid,
const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cb, void *u);
diff --git a/lib/libcrypto/pem/pem_pkey.c b/lib/libcrypto/pem/pem_pkey.c
index 68d6590f14b..7e5e4f57718 100644
--- a/lib/libcrypto/pem/pem_pkey.c
+++ b/lib/libcrypto/pem/pem_pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_pkey.c,v 1.16 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: pem_pkey.c,v 1.17 2014/07/11 08:44:49 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -61,17 +61,18 @@
#include <openssl/opensslconf.h>
-#include "cryptlib.h"
#include <openssl/buffer.h>
-#include <openssl/objects.h>
#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
+#include <openssl/pkcs12.h>
#include <openssl/rand.h>
#include <openssl/x509.h>
-#include <openssl/pkcs12.h>
-#include <openssl/pem.h>
+
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
+
#include "asn1_locl.h"
int pem_check_suffix(const char *pem_str, const char *suffix);
diff --git a/lib/libcrypto/pem/pem_seal.c b/lib/libcrypto/pem/pem_seal.c
index 08680e45db0..90ba01584c2 100644
--- a/lib/libcrypto/pem/pem_seal.c
+++ b/lib/libcrypto/pem/pem_seal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_seal.c,v 1.19 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: pem_seal.c,v 1.20 2014/07/11 08:44:49 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -62,13 +62,14 @@
#include <openssl/opensslconf.h> /* for OPENSSL_NO_RSA */
#ifndef OPENSSL_NO_RSA
-#include "cryptlib.h"
+
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <openssl/objects.h>
-#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
+#include <openssl/x509.h>
int
PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
diff --git a/lib/libcrypto/pem/pem_sign.c b/lib/libcrypto/pem/pem_sign.c
index f1c4d4dcb95..0f996c7220a 100644
--- a/lib/libcrypto/pem/pem_sign.c
+++ b/lib/libcrypto/pem/pem_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_sign.c,v 1.10 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: pem_sign.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -57,12 +57,13 @@
*/
#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/rand.h>
+
+#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
-#include <openssl/x509.h>
#include <openssl/pem.h>
+#include <openssl/rand.h>
+#include <openssl/x509.h>
void
PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
diff --git a/lib/libcrypto/pem/pem_x509.c b/lib/libcrypto/pem/pem_x509.c
index 7b4b888ea94..e4b7f1c2c69 100644
--- a/lib/libcrypto/pem/pem_x509.c
+++ b/lib/libcrypto/pem/pem_x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_x509.c,v 1.5 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: pem_x509.c,v 1.6 2014/07/11 08:44:49 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2001.
*/
@@ -57,11 +57,11 @@
*/
#include <stdio.h>
-#include "cryptlib.h"
+
#include <openssl/bio.h>
#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pkcs7.h>
#include <openssl/pem.h>
+#include <openssl/pkcs7.h>
+#include <openssl/x509.h>
IMPLEMENT_PEM_rw(X509, X509, PEM_STRING_X509, X509)
diff --git a/lib/libcrypto/pem/pem_xaux.c b/lib/libcrypto/pem/pem_xaux.c
index 99e2cd367b2..eb768405321 100644
--- a/lib/libcrypto/pem/pem_xaux.c
+++ b/lib/libcrypto/pem/pem_xaux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_xaux.c,v 1.6 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: pem_xaux.c,v 1.7 2014/07/11 08:44:49 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2001.
*/
@@ -57,12 +57,12 @@
*/
#include <stdio.h>
-#include "cryptlib.h"
+
#include <openssl/bio.h>
#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pkcs7.h>
#include <openssl/pem.h>
+#include <openssl/pkcs7.h>
+#include <openssl/x509.h>
IMPLEMENT_PEM_rw(X509_AUX, X509, PEM_STRING_X509_TRUSTED, X509_AUX)
IMPLEMENT_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR, PEM_STRING_X509_PAIR,
diff --git a/lib/libcrypto/pem/pvkfmt.c b/lib/libcrypto/pem/pvkfmt.c
index 8a945b4dd77..55cfffa7bc7 100644
--- a/lib/libcrypto/pem/pvkfmt.c
+++ b/lib/libcrypto/pem/pvkfmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pvkfmt.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: pvkfmt.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2005.
*/
@@ -64,10 +64,11 @@
#include <openssl/opensslconf.h>
-#include "cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/rand.h>
-#include <openssl/bn.h>
+
#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA)
#include <openssl/dsa.h>
#include <openssl/rsa.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 22:47:05 +0000