projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import evp_test.c from BoringSSL. Unfortunately we already have a file
[openssl.git]
/
crypto
/
pkcs12
/
p12_p8d.c
diff --git
a/crypto/pkcs12/p12_p8d.c
b/crypto/pkcs12/p12_p8d.c
index deba81e4a97f9a3424297a7f9c6d9e56fb2e005a..3cc7a9f40e9d6be88451a5adfa4d4a4c7f64ec0f 100644
(file)
--- a/
crypto/pkcs12/p12_p8d.c
+++ b/
crypto/pkcs12/p12_p8d.c
@@
-1,6
+1,7
@@
/* p12_p8d.c */
/* p12_p8d.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2001.
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2001.
*/
/* ====================================================================
* Copyright (c) 2001 The OpenSSL Project. All rights reserved.
*/
/* ====================================================================
* Copyright (c) 2001 The OpenSSL Project. All rights reserved.
@@
-10,7
+11,7
@@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@
-60,9
+61,10
@@
#include "cryptlib.h"
#include <openssl/pkcs12.h>
#include "cryptlib.h"
#include <openssl/pkcs12.h>
-PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen)
+PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass,
+ int passlen)
{
{
- return PKCS12_item_decrypt_d2i(p8->algor, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass,
- passlen, p8->digest, 1);
+ return PKCS12_item_decrypt_d2i(p8->algor,
+ ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass,
+ passlen, p8->digest, 1);
}
}
-