aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/src/pubkey_cert.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-11-30 18:05:21 +0100
committerIngela Anderton Andin <[email protected]>2011-12-09 10:36:21 +0100
commitca0ee66eb4ea52e8c36aaf683cdef32e4d2cb9bc (patch)
treea659ba8406cc794ce0dc55260319d2f7a7189933 /lib/public_key/src/pubkey_cert.erl
parentac3cbe8bee6b826004c02a1d21f8093899716b33 (diff)
downloadotp-ca0ee66eb4ea52e8c36aaf683cdef32e4d2cb9bc.tar.gz
otp-ca0ee66eb4ea52e8c36aaf683cdef32e4d2cb9bc.tar.bz2
otp-ca0ee66eb4ea52e8c36aaf683cdef32e4d2cb9bc.zip
Converted pk12 test suite files to pem and adjusted our framework
to deal with changes to the pkits suite.
Diffstat (limited to 'lib/public_key/src/pubkey_cert.erl')
-rw-r--r--lib/public_key/src/pubkey_cert.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index 5ab9642279..b76e32a2a0 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -351,7 +351,7 @@ extensions_list(Extensions) ->
extract_verify_data(OtpCert, DerCert) ->
- {0, Signature} = OtpCert#'OTPCertificate'.signature,
+ {_, Signature} = OtpCert#'OTPCertificate'.signature,
SigAlgRec = OtpCert#'OTPCertificate'.signatureAlgorithm,
SigAlg = SigAlgRec#'SignatureAlgorithm'.algorithm,
PlainText = encoded_tbs_cert(DerCert),
@@ -376,6 +376,10 @@ encoded_tbs_cert(Cert) ->
digest_type(?sha1WithRSAEncryption) ->
sha;
+digest_type(?sha256WithRSAEncryption) ->
+ sha256;
+digest_type(?sha512WithRSAEncryption) ->
+ sha512;
digest_type(?md5WithRSAEncryption) ->
md5;
digest_type(?'id-dsa-with-sha1') ->