190 lines
5.4 KiB
Diff
190 lines
5.4 KiB
Diff
diff -up openssl-1.0.0/crypto/pem/pem_all.c.pkcs8 openssl-1.0.0/crypto/pem/pem_all.c
|
|
--- openssl-1.0.0/crypto/pem/pem_all.c.pkcs8 2006-11-06 20:53:37.000000000 +0100
|
|
+++ openssl-1.0.0/crypto/pem/pem_all.c 2012-04-26 17:17:35.765317652 +0200
|
|
@@ -147,7 +147,37 @@ IMPLEMENT_PEM_rw(PKCS7, PKCS7, PEM_STRIN
|
|
|
|
IMPLEMENT_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE,
|
|
PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)
|
|
+#ifdef OPENSSL_FIPS
|
|
|
|
+static int fips_PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
|
|
+ unsigned char *kstr, int klen,
|
|
+ pem_password_cb *cb, void *u)
|
|
+ {
|
|
+ if (FIPS_mode())
|
|
+ return PEM_write_bio_PKCS8PrivateKey(bp, x, enc,
|
|
+ (char *)kstr, klen, cb, u);
|
|
+ else
|
|
+ return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
|
|
+ ((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:(x->type == EVP_PKEY_RSA)?PEM_STRING_RSA:PEM_STRING_ECPRIVATEKEY),
|
|
+ bp,x,enc,kstr,klen,cb,u);
|
|
+ }
|
|
+
|
|
+#ifndef OPENSSL_NO_FP_API
|
|
+static int fips_PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
|
|
+ unsigned char *kstr, int klen,
|
|
+ pem_password_cb *cb, void *u)
|
|
+ {
|
|
+ if (FIPS_mode())
|
|
+ return PEM_write_PKCS8PrivateKey(fp, x, enc,
|
|
+ (char *)kstr, klen, cb, u);
|
|
+ else
|
|
+ return PEM_ASN1_write((i2d_of_void *)i2d_PrivateKey,
|
|
+ ((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:(x->type == EVP_PKEY_RSA)?PEM_STRING_RSA:PEM_STRING_ECPRIVATEKEY),
|
|
+ fp,x,enc,kstr,klen,cb,u);
|
|
+ }
|
|
+#endif
|
|
+
|
|
+#endif
|
|
|
|
#ifndef OPENSSL_NO_RSA
|
|
|
|
@@ -193,7 +223,49 @@ RSA *PEM_read_RSAPrivateKey(FILE *fp, RS
|
|
|
|
#endif
|
|
|
|
+#ifdef OPENSSL_FIPS
|
|
+
|
|
+int PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x, const EVP_CIPHER *enc,
|
|
+ unsigned char *kstr, int klen,
|
|
+ pem_password_cb *cb, void *u)
|
|
+{
|
|
+ EVP_PKEY *k;
|
|
+ int ret;
|
|
+ k = EVP_PKEY_new();
|
|
+ if (!k)
|
|
+ return 0;
|
|
+ EVP_PKEY_set1_RSA(k, x);
|
|
+
|
|
+ ret = fips_PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
|
|
+ EVP_PKEY_free(k);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+#ifndef OPENSSL_NO_FP_API
|
|
+int PEM_write_RSAPrivateKey(FILE *fp, RSA *x, const EVP_CIPHER *enc,
|
|
+ unsigned char *kstr, int klen,
|
|
+ pem_password_cb *cb, void *u)
|
|
+{
|
|
+ EVP_PKEY *k;
|
|
+ int ret;
|
|
+ k = EVP_PKEY_new();
|
|
+ if (!k)
|
|
+ return 0;
|
|
+
|
|
+ EVP_PKEY_set1_RSA(k, x);
|
|
+
|
|
+ ret = fips_PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
|
|
+ EVP_PKEY_free(k);
|
|
+ return ret;
|
|
+}
|
|
+#endif
|
|
+
|
|
+#else
|
|
+
|
|
IMPLEMENT_PEM_write_cb_const(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
|
|
+
|
|
+#endif
|
|
+
|
|
IMPLEMENT_PEM_rw_const(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC, RSAPublicKey)
|
|
IMPLEMENT_PEM_rw(RSA_PUBKEY, RSA, PEM_STRING_PUBLIC, RSA_PUBKEY)
|
|
|
|
@@ -223,7 +295,47 @@ DSA *PEM_read_bio_DSAPrivateKey(BIO *bp,
|
|
return pkey_get_dsa(pktmp, dsa); /* will free pktmp */
|
|
}
|
|
|
|
+#ifdef OPENSSL_FIPS
|
|
+
|
|
+int PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x, const EVP_CIPHER *enc,
|
|
+ unsigned char *kstr, int klen,
|
|
+ pem_password_cb *cb, void *u)
|
|
+{
|
|
+ EVP_PKEY *k;
|
|
+ int ret;
|
|
+ k = EVP_PKEY_new();
|
|
+ if (!k)
|
|
+ return 0;
|
|
+ EVP_PKEY_set1_DSA(k, x);
|
|
+
|
|
+ ret = fips_PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
|
|
+ EVP_PKEY_free(k);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+#ifndef OPENSSL_NO_FP_API
|
|
+int PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc,
|
|
+ unsigned char *kstr, int klen,
|
|
+ pem_password_cb *cb, void *u)
|
|
+{
|
|
+ EVP_PKEY *k;
|
|
+ int ret;
|
|
+ k = EVP_PKEY_new();
|
|
+ if (!k)
|
|
+ return 0;
|
|
+ EVP_PKEY_set1_DSA(k, x);
|
|
+ ret = fips_PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
|
|
+ EVP_PKEY_free(k);
|
|
+ return ret;
|
|
+}
|
|
+#endif
|
|
+
|
|
+#else
|
|
+
|
|
IMPLEMENT_PEM_write_cb_const(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
|
|
+
|
|
+#endif
|
|
+
|
|
IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
|
|
|
|
#ifndef OPENSSL_NO_FP_API
|
|
@@ -269,8 +381,49 @@ EC_KEY *PEM_read_bio_ECPrivateKey(BIO *b
|
|
|
|
IMPLEMENT_PEM_rw_const(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS, ECPKParameters)
|
|
|
|
+
|
|
+
|
|
+#ifdef OPENSSL_FIPS
|
|
+
|
|
+int PEM_write_bio_ECPrivateKey(BIO *bp, EC_KEY *x, const EVP_CIPHER *enc,
|
|
+ unsigned char *kstr, int klen,
|
|
+ pem_password_cb *cb, void *u)
|
|
+{
|
|
+ EVP_PKEY *k;
|
|
+ int ret;
|
|
+ k = EVP_PKEY_new();
|
|
+ if (!k)
|
|
+ return 0;
|
|
+ EVP_PKEY_set1_EC_KEY(k, x);
|
|
+
|
|
+ ret = fips_PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
|
|
+ EVP_PKEY_free(k);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+#ifndef OPENSSL_NO_FP_API
|
|
+int PEM_write_ECPrivateKey(FILE *fp, EC_KEY *x, const EVP_CIPHER *enc,
|
|
+ unsigned char *kstr, int klen,
|
|
+ pem_password_cb *cb, void *u)
|
|
+{
|
|
+ EVP_PKEY *k;
|
|
+ int ret;
|
|
+ k = EVP_PKEY_new();
|
|
+ if (!k)
|
|
+ return 0;
|
|
+ EVP_PKEY_set1_EC_KEY(k, x);
|
|
+ ret = fips_PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
|
|
+ EVP_PKEY_free(k);
|
|
+ return ret;
|
|
+}
|
|
+#endif
|
|
+
|
|
+#else
|
|
+
|
|
IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY, ECPrivateKey)
|
|
|
|
+#endif
|
|
+
|
|
IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)
|
|
|
|
#ifndef OPENSSL_NO_FP_API
|