aabbc9
diff -up openssl-1.0.0-beta4/doc/crypto/EVP_DigestInit.pod.algo-doc openssl-1.0.0-beta4/doc/crypto/EVP_DigestInit.pod
aabbc9
--- openssl-1.0.0-beta4/doc/crypto/EVP_DigestInit.pod.algo-doc	2009-10-16 17:29:34.000000000 +0200
aabbc9
+++ openssl-1.0.0-beta4/doc/crypto/EVP_DigestInit.pod	2009-11-12 14:13:21.000000000 +0100
ed645a
@@ -6,7 +6,8 @@ EVP_MD_CTX_init, EVP_MD_CTX_create, EVP_
ed645a
 EVP_DigestFinal_ex, EVP_MD_CTX_cleanup, EVP_MD_CTX_destroy, EVP_MAX_MD_SIZE,
ed645a
 EVP_MD_CTX_copy_ex, EVP_MD_CTX_copy, EVP_MD_type, EVP_MD_pkey_type, EVP_MD_size,
ed645a
 EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size, EVP_MD_CTX_block_size, EVP_MD_CTX_type,
ed645a
-EVP_md_null, EVP_md2, EVP_md5, EVP_sha, EVP_sha1, EVP_dss, EVP_dss1, EVP_mdc2,
ed645a
+EVP_md_null, EVP_md2, EVP_md5, EVP_sha, EVP_sha1, EVP_sha224,
ed645a
+EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1, EVP_mdc2,
ed645a
 EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid, EVP_get_digestbyobj -
ed645a
 EVP digest routines
ed645a
 
ed645a
@@ -51,6 +52,10 @@ EVP digest routines
ed645a
  const EVP_MD *EVP_md5(void);
ed645a
  const EVP_MD *EVP_sha(void);
ed645a
  const EVP_MD *EVP_sha1(void);
ed645a
+ const EVP_MD *EVP_sha224(void);
ed645a
+ const EVP_MD *EVP_sha256(void);
ed645a
+ const EVP_MD *EVP_sha384(void);
ed645a
+ const EVP_MD *EVP_sha512(void);
ed645a
  const EVP_MD *EVP_dss(void);
ed645a
  const EVP_MD *EVP_dss1(void);
ed645a
  const EVP_MD *EVP_mdc2(void);
ed645a
@@ -70,7 +75,7 @@ EVP_MD_CTX_create() allocates, initializ
ed645a
 
ed645a
 EVP_DigestInit_ex() sets up digest context B<ctx> to use a digest
ed645a
 B<type> from ENGINE B<impl>. B<ctx> must be initialized before calling this
ed645a
-function. B<type> will typically be supplied by a functionsuch as EVP_sha1().
ed645a
+function. B<type> will typically be supplied by a function such as EVP_sha1().
ed645a
 If B<impl> is NULL then the default implementation of digest B<type> is used.
ed645a
 
ed645a
 EVP_DigestUpdate() hashes B<cnt> bytes of data at B<d> into the
ed645a
@@ -127,9 +132,11 @@ with this digest. For example EVP_sha1()
ed645a
 return B<nid_sha1withrsaencryption>. This "link" between digests and signature
ed645a
 algorithms may not be retained in future versions of OpenSSL.
ed645a
 
ed645a
-EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_mdc2() and EVP_ripemd160()
ed645a
-return B<evp_md> structures for the MD2, MD5, SHA, SHA1, MDC2 and RIPEMD160 digest
ed645a
-algorithms respectively. The associated signature algorithm is RSA in each case.
ed645a
+EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_sha224(), EVP_sha256(),
ed645a
+EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160()
ed645a
+return B<evp_md> structures for the MD2, MD5, SHA, SHA1, SHA224, SHA256, SHA384,
ed645a
+SHA512, MDC2 and RIPEMD160 digest algorithms respectively. The associated
ed645a
+signature algorithm is RSA in each case.
ed645a
 
ed645a
 EVP_dss() and EVP_dss1() return B<evp_md> structures for SHA and SHA1 digest
aabbc9
 algorithms but using DSS (DSA) for the signature algorithm. Note: there is 
aabbc9
@@ -158,7 +165,8 @@ EVP_MD_size(), EVP_MD_block_size(), EVP_
ed645a
 EVP_MD_CTX_block_size()	and EVP_MD_block_size() return the digest or block
ed645a
 size in bytes.
ed645a
 
ed645a
-EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_dss(),
ed645a
+EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(),
ed645a
+EVP_sha224(), EVP_sha256(), EVP_sha384(), EVP_sha512(), EVP_dss(),
ed645a
 EVP_dss1(), EVP_mdc2() and EVP_ripemd160() return pointers to the
ed645a
 corresponding EVP_MD structures.
ed645a
 
aabbc9
diff -up openssl-1.0.0-beta4/doc/crypto/EVP_EncryptInit.pod.algo-doc openssl-1.0.0-beta4/doc/crypto/EVP_EncryptInit.pod
aabbc9
--- openssl-1.0.0-beta4/doc/crypto/EVP_EncryptInit.pod.algo-doc	2005-04-15 18:01:35.000000000 +0200
aabbc9
+++ openssl-1.0.0-beta4/doc/crypto/EVP_EncryptInit.pod	2009-11-12 14:11:03.000000000 +0100
ed645a
@@ -91,6 +91,32 @@ EVP_CIPHER_CTX_set_padding - EVP cipher 
ed645a
  int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
ed645a
  int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
ed645a
 
ed645a
+ const EVP_CIPHER *EVP_des_ede3(void);
ed645a
+ const EVP_CIPHER *EVP_des_ede3_ecb(void);
ed645a
+ const EVP_CIPHER *EVP_des_ede3_cfb64(void);
ed645a
+ const EVP_CIPHER *EVP_des_ede3_cfb1(void);
ed645a
+ const EVP_CIPHER *EVP_des_ede3_cfb8(void);
ed645a
+ const EVP_CIPHER *EVP_des_ede3_ofb(void);
ed645a
+ const EVP_CIPHER *EVP_des_ede3_cbc(void);
ed645a
+ const EVP_CIPHER *EVP_aes_128_ecb(void);
ed645a
+ const EVP_CIPHER *EVP_aes_128_cbc(void);
ed645a
+ const EVP_CIPHER *EVP_aes_128_cfb1(void);
ed645a
+ const EVP_CIPHER *EVP_aes_128_cfb8(void);
ed645a
+ const EVP_CIPHER *EVP_aes_128_cfb128(void);
ed645a
+ const EVP_CIPHER *EVP_aes_128_ofb(void);
ed645a
+ const EVP_CIPHER *EVP_aes_192_ecb(void);
ed645a
+ const EVP_CIPHER *EVP_aes_192_cbc(void);
ed645a
+ const EVP_CIPHER *EVP_aes_192_cfb1(void);
ed645a
+ const EVP_CIPHER *EVP_aes_192_cfb8(void);
ed645a
+ const EVP_CIPHER *EVP_aes_192_cfb128(void);
ed645a
+ const EVP_CIPHER *EVP_aes_192_ofb(void);
ed645a
+ const EVP_CIPHER *EVP_aes_256_ecb(void);
ed645a
+ const EVP_CIPHER *EVP_aes_256_cbc(void);
ed645a
+ const EVP_CIPHER *EVP_aes_256_cfb1(void);
ed645a
+ const EVP_CIPHER *EVP_aes_256_cfb8(void);
ed645a
+ const EVP_CIPHER *EVP_aes_256_cfb128(void);
ed645a
+ const EVP_CIPHER *EVP_aes_256_ofb(void);
ed645a
+
ed645a
 =head1 DESCRIPTION
ed645a
 
ed645a
 The EVP cipher routines are a high level interface to certain
ed645a
@@ -297,6 +323,18 @@ Three key triple DES in CBC, ECB, CFB an
ed645a
 
ed645a
 DESX algorithm in CBC mode.
ed645a
 
ed645a
+=item EVP_aes_128_cbc(void), EVP_aes_128_ecb(), EVP_aes_128_ofb(void), EVP_aes_128_cfb1(void), EVP_aes_128_cfb8(void), EVP_aes_128_cfb128(void)
ed645a
+
ed645a
+AES with 128 bit key length in CBC, ECB, OFB and CFB modes respectively.
ed645a
+
ed645a
+=item EVP_aes_192_cbc(void), EVP_aes_192_ecb(), EVP_aes_192_ofb(void), EVP_aes_192_cfb1(void), EVP_aes_192_cfb8(void), EVP_aes_192_cfb128(void)
ed645a
+
ed645a
+AES with 192 bit key length in CBC, ECB, OFB and CFB modes respectively.
ed645a
+
ed645a
+=item EVP_aes_256_cbc(void), EVP_aes_256_ecb(), EVP_aes_256_ofb(void), EVP_aes_256_cfb1(void), EVP_aes_256_cfb8(void), EVP_aes_256_cfb128(void)
ed645a
+
ed645a
+AES with 256 bit key length in CBC, ECB, OFB and CFB modes respectively.
ed645a
+
ed645a
 =item EVP_rc4(void)
ed645a
 
ed645a
 RC4 stream cipher. This is a variable key length cipher with default key length 128 bits.